shapely 1.2.10__tar.gz → 1.2.12__tar.gz

{Shapely-1.2.10 → Shapely-1.2.12}/CHANGES.txt

@@ -2,6 +2,21 @@
 CHANGES
 =======
 
+1.2.12 (2011-08-15)
+-------------------
+- Build Windows distributions with VC7 or VC9 as appropriate.
+- More verbose report on failure to speed up.
+- Fix for prepared geometries broken in 1.2.11.
+- DO NOT INSTALL 1.2.11
+
+1.2.11 (2011-08-04)
+-------------------
+- Ignore AttributeError during exit.
+- PyPy 1.5 support.
+- Prevent operation on prepared geometry crasher (#12).
+- Optional Cython speedups for Windows.
+- Linux 3 platform support.
+
 1.2.10 (2011-05-09)
 -------------------
 - Add optional Cython speedups.

{Shapely-1.2.10 → Shapely-1.2.12}/CREDITS.txt

@@ -3,6 +3,7 @@ Shapely is written by:
 * Sean Gillies
 * Aron Bierbaum
 * Kai Lautaportti
+* Oliver Tonnhofer
 
 Patches contributed by:
 
@@ -11,7 +12,6 @@ Patches contributed by:
 * Eric Lemoine
 * Jonathan Tartley
 * Kristian Thy
-* Oliver Tonnhofer
 
 Additional help from:
 
@@ -22,3 +22,5 @@ Additional help from:
 
 Major portions of this work were supported by a grant (for Pleiades_) from the
 U.S. National Endowment for the Humanities (http://www.neh.gov).
+
+.. _Pleiades: http://pleiades.stoa.org

{Shapely-1.2.10/Shapely.egg-info → Shapely-1.2.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: Shapely
-Version: 1.2.10
+Version: 1.2.12
 Summary: Geometric objects, predicates, and operations
 Home-page: http://trac.gispython.org/lab/wiki/Shapely
 Author: Sean Gillies
@@ -166,6 +166,21 @@ Description: ======
         CHANGES
         =======
         
+        1.2.12 (2011-08-15)
+        -------------------
+        - Build Windows distributions with VC7 or VC9 as appropriate.
+        - More verbose report on failure to speed up.
+        - Fix for prepared geometries broken in 1.2.11.
+        - DO NOT INSTALL 1.2.11
+        
+        1.2.11 (2011-08-04)
+        -------------------
+        - Ignore AttributeError during exit.
+        - PyPy 1.5 support.
+        - Prevent operation on prepared geometry crasher (#12).
+        - Optional Cython speedups for Windows.
+        - Linux 3 platform support.
+        
         1.2.10 (2011-05-09)
         -------------------
         - Add optional Cython speedups.

{Shapely-1.2.10 → Shapely-1.2.12/Shapely.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: Shapely
-Version: 1.2.10
+Version: 1.2.12
 Summary: Geometric objects, predicates, and operations
 Home-page: http://trac.gispython.org/lab/wiki/Shapely
 Author: Sean Gillies
@@ -166,6 +166,21 @@ Description: ======
         CHANGES
         =======
         
+        1.2.12 (2011-08-15)
+        -------------------
+        - Build Windows distributions with VC7 or VC9 as appropriate.
+        - More verbose report on failure to speed up.
+        - Fix for prepared geometries broken in 1.2.11.
+        - DO NOT INSTALL 1.2.11
+        
+        1.2.11 (2011-08-04)
+        -------------------
+        - Ignore AttributeError during exit.
+        - PyPy 1.5 support.
+        - Prevent operation on prepared geometry crasher (#12).
+        - Optional Cython speedups for Windows.
+        - Linux 3 platform support.
+        
         1.2.10 (2011-05-09)
         -------------------
         - Add optional Cython speedups.

{Shapely-1.2.10 → Shapely-1.2.12}/setup.py

@@ -15,6 +15,7 @@ from setuptools.extension import Extension
 from setuptools.command.build_ext import build_ext
 from setuptools import setup, find_packages
 import sys
+import platform
 
 readme_text = file('README.txt', 'rb').read()
 changes_text = file('CHANGES.txt', 'rb').read()
@@ -22,7 +23,7 @@ changes_text = file('CHANGES.txt', 'rb').read()
 setup_args = dict(
     metadata_version    = '1.2',
     name                = 'Shapely',
-    version             = '1.2.10',
+    version             = '1.2.12',
     requires_python     = '>=2.5,<3',
     requires_external   = 'libgeos_c (>=3.1)', 
     description         = 'Geometric objects, predicates, and operations',
@@ -51,11 +52,15 @@ setup_args = dict(
 if sys.platform == 'win32':
     if '(AMD64)' in sys.version:
         setup_args.update(
-            data_files=[('DLLs', glob.glob('DLLs_AMD64/*.dll'))]
+            data_files=[('DLLs', glob.glob('DLLs_AMD64_VC9/*.dll'))]
             )
+    elif platform.python_version().startswith('2.5.'):
+        setup_args.update(
+            data_files=[('DLLs', glob.glob('DLLs_x86_VC7/*.dll'))]
+            )       
     else:
         setup_args.update(
-            data_files=[('DLLs', glob.glob('DLLs_x86/*.dll'))]
+            data_files=[('DLLs', glob.glob('DLLs_x86_VC9/*.dll'))]
             )
 
 
@@ -88,6 +93,14 @@ class ve_build_ext(build_ext):
             raise BuildFailed(x)
 
 if sys.platform == 'win32':
+    # geos DLL is geos.dll instead of geos_c.dll on Windows
+    ext_modules = [
+        Extension("shapely.speedups._speedups",
+              ["shapely/speedups/_speedups.c"], libraries=['geos']),
+    ]
+elif (hasattr(platform, 'python_implementation') 
+    and platform.python_implementation() == 'PyPy'):
+    # python_implementation >= 2.6
     ext_modules = []
 else:
     ext_modules = [

{Shapely-1.2.10 → Shapely-1.2.12}/shapely/ctypes_declarations.py

@@ -6,12 +6,17 @@ import ctypes
 class allocated_c_char_p(ctypes.c_char_p):
     pass
 
+EXCEPTION_HANDLER_FUNCTYPE = ctypes.CFUNCTYPE(None, ctypes.c_char_p, ctypes.c_char_p)
+
 def prototype(lgeos, geosVersion):
 
+    lgeos.initGEOS.argtypes = [EXCEPTION_HANDLER_FUNCTYPE, EXCEPTION_HANDLER_FUNCTYPE]
     lgeos.initGEOS.restype = None
 
+    lgeos.finishGEOS.argtypes = []
     lgeos.finishGEOS.restype = None
 
+    lgeos.GEOSversion.argtypes = []
     lgeos.GEOSversion.restype = ctypes.c_char_p
 
     lgeos.GEOSGeomFromWKT.restype = ctypes.c_void_p

{Shapely-1.2.10 → Shapely-1.2.12}/shapely/geometry/base.py

@@ -104,7 +104,10 @@ class BaseGeometry(object):
         # TODO: defer cleanup to the implementation. We shouldn't be
         # explicitly calling a lgeos method here.
         if not (self._owned or self._is_empty):
-            self._lgeos.GEOSGeom_destroy(self.__geom__)
+            try:
+                self._lgeos.GEOSGeom_destroy(self.__geom__)
+            except AttributeError:
+                pass # _lgeos might be empty on shutdown
         self.__geom__ = EMPTY
 
     def __del__(self):

{Shapely-1.2.10 → Shapely-1.2.12}/shapely/geometry/linestring.py

@@ -167,9 +167,10 @@ def geos_linestring_from_py(ob, update_geom=None, update_ndim=0):
         assert n == 2 or n == 3
 
         # Make pointer to the coordinate array
-        try:
+        if isinstance(array['data'], tuple):
+            # numpy tuple (addr, read-only)
             cp = cast(array['data'][0], POINTER(c_double))
-        except ArgumentError:
+        else:
             cp = array['data']
 
         # Create a coordinate sequence
@@ -226,21 +227,15 @@ def geos_linestring_from_py(ob, update_geom=None, update_ndim=0):
         # add to coordinate sequence
         for i in xrange(m):
             coords = ob[i]
-            dx = c_double(coords[0])
-            dy = c_double(coords[1])
-            dz = None
+            # Because of a bug in the GEOS C API, 
+            # always set X before Y
+            lgeos.GEOSCoordSeq_setX(cs, i, coords[0])
+            lgeos.GEOSCoordSeq_setY(cs, i, coords[1])
             if n == 3:
                 try:
-                    dz = c_double(coords[2])
+                    lgeos.GEOSCoordSeq_setZ(cs, i, coords[2])
                 except IndexError:
                     raise ValueError("Inconsistent coordinate dimensionality")
-        
-            # Because of a bug in the GEOS C API, 
-            # always set X before Y
-            lgeos.GEOSCoordSeq_setX(cs, i, dx)
-            lgeos.GEOSCoordSeq_setY(cs, i, dy)
-            if n == 3:
-                lgeos.GEOSCoordSeq_setZ(cs, i, dz)
     
     if update_geom is not None:
         return None

{Shapely-1.2.10 → Shapely-1.2.12}/shapely/geometry/multilinestring.py

@@ -93,9 +93,6 @@ def geos_multilinestring_from_py(ob):
         L = array['shape'][0]
         assert L >= 1
 
-        # Make pointer to the coordinate array
-        cp = cast(array['data'][0], POINTER(c_double))
-
         # Array of pointers to sub-geometries
         subs = (c_void_p * L)()
 

{Shapely-1.2.10 → Shapely-1.2.12}/shapely/geometry/multipoint.py

@@ -138,9 +138,10 @@ def geos_multipoint_from_py(ob):
         assert n == 2 or n == 3
 
         # Make pointer to the coordinate array
-        try:
+        if isinstance(array['data'], tuple):
+            # numpy tuple (addr, read-only)
             cp = cast(array['data'][0], POINTER(c_double))
-        except ArgumentError:
+        else:
             cp = array['data']
 
         # Array of pointers to sub-geometries

{Shapely-1.2.10 → Shapely-1.2.12}/shapely/geometry/polygon.py

@@ -312,9 +312,10 @@ def geos_linearring_from_py(ob, update_geom=None, update_ndim=0):
         assert n == 2 or n == 3
 
         # Make pointer to the coordinate array
-        try:
+        if isinstance(array['data'], tuple):
+            # numpy tuple (addr, read-only)
             cp = cast(array['data'][0], POINTER(c_double))
-        except ArgumentError:
+        else:
             cp = array['data']
 
         # Add closing coordinates to sequence?
@@ -335,33 +336,21 @@ def geos_linearring_from_py(ob, update_geom=None, update_ndim=0):
 
         # add to coordinate sequence
         for i in xrange(m):
-            dx = c_double(cp[n*i])
-            dy = c_double(cp[n*i+1])
-            dz = None
-            if n == 3:
-                dz = c_double(cp[n*i+2])
-        
             # Because of a bug in the GEOS C API, 
             # always set X before Y
-            lgeos.GEOSCoordSeq_setX(cs, i, dx)
-            lgeos.GEOSCoordSeq_setY(cs, i, dy)
+            lgeos.GEOSCoordSeq_setX(cs, i, cp[n*i])
+            lgeos.GEOSCoordSeq_setY(cs, i, cp[n*i+1])
             if n == 3:
-                lgeos.GEOSCoordSeq_setZ(cs, i, dz)
+                lgeos.GEOSCoordSeq_setZ(cs, i, cp[n*i+2])
 
         # Add closing coordinates to sequence?
-        if M > m:
-            dx = c_double(cp[0])
-            dy = c_double(cp[1])
-            dz = None
-            if n == 3:
-                dz = c_double(cp[2])
-        
+        if M > m:        
             # Because of a bug in the GEOS C API, 
             # always set X before Y
-            lgeos.GEOSCoordSeq_setX(cs, M-1, dx)
-            lgeos.GEOSCoordSeq_setY(cs, M-1, dy)
+            lgeos.GEOSCoordSeq_setX(cs, M-1, cp[0])
+            lgeos.GEOSCoordSeq_setY(cs, M-1, cp[1])
             if n == 3:
-                lgeos.GEOSCoordSeq_setZ(cs, M-1, dz)
+                lgeos.GEOSCoordSeq_setZ(cs, M-1, cp[2])
             
     except AttributeError:
         # Fall back on list
@@ -391,34 +380,25 @@ def geos_linearring_from_py(ob, update_geom=None, update_ndim=0):
         # add to coordinate sequence
         for i in xrange(m):
             coords = ob[i]
-            dx = c_double(coords[0])
-            dy = c_double(coords[1])
-            dz = None
-            if n == 3:
-                dz = c_double(coords[2])
-        
             # Because of a bug in the GEOS C API, 
             # always set X before Y
-            lgeos.GEOSCoordSeq_setX(cs, i, dx)
-            lgeos.GEOSCoordSeq_setY(cs, i, dy)
+            lgeos.GEOSCoordSeq_setX(cs, i, coords[0])
+            lgeos.GEOSCoordSeq_setY(cs, i, coords[1])
             if n == 3:
-                lgeos.GEOSCoordSeq_setZ(cs, i, dz)
+                try:
+                    lgeos.GEOSCoordSeq_setZ(cs, i, coords[2])
+                except IndexError:
+                    raise ValueError("Inconsistent coordinate dimensionality")
 
         # Add closing coordinates to sequence?
         if M > m:
             coords = ob[0]
-            dx = c_double(coords[0])
-            dy = c_double(coords[1])
-            dz = None
-            if n == 3:
-                dz = c_double(coords[2])
-        
             # Because of a bug in the GEOS C API, 
             # always set X before Y
-            lgeos.GEOSCoordSeq_setX(cs, M-1, dx)
-            lgeos.GEOSCoordSeq_setY(cs, M-1, dy)
+            lgeos.GEOSCoordSeq_setX(cs, M-1, coords[0])
+            lgeos.GEOSCoordSeq_setY(cs, M-1, coords[1])
             if n == 3:
-                lgeos.GEOSCoordSeq_setZ(cs, M-1, dz)
+                lgeos.GEOSCoordSeq_setZ(cs, M-1, coords[2])
 
     if update_geom is not None:
         return None

{Shapely-1.2.10 → Shapely-1.2.12}/shapely/geos.py

@@ -12,7 +12,7 @@ from ctypes import cdll, CDLL, CFUNCTYPE, c_char_p, c_void_p, string_at
 from ctypes.util import find_library
 
 import ftools
-from ctypes_declarations import prototype
+from ctypes_declarations import prototype, EXCEPTION_HANDLER_FUNCTYPE
 
 
 
@@ -43,7 +43,7 @@ def load_dll(libname, fallbacks=None):
             "Could not find library %s or load any of its variants %s" % (
                 libname, fallbacks or []))
        
-if sys.platform == 'linux2':
+if sys.platform.startswith('linux'):
     _lgeos = load_dll('geos_c', fallbacks=['libgeos_c.so.1', 'libgeos_c.so'])
     free = load_dll('c').free
     free.argtypes = [c_void_p]
@@ -92,6 +92,7 @@ else: # other *nix systems
 
 def _geos_c_version():
     func = _lgeos.GEOSversion
+    func.argtypes = []
     func.restype = c_char_p
     v = func().split('-')[2]
     return tuple(int(n) for n in v.split('.'))
@@ -129,7 +130,7 @@ if geos_c_version >= (1,5,0):
     
     # Handle special case.
     _lgeos.initGEOS_r.restype = c_void_p
-    _lgeos.initGEOS_r.argtypes = [c_void_p, c_void_p]
+    _lgeos.initGEOS_r.argtypes = [EXCEPTION_HANDLER_FUNCTYPE, EXCEPTION_HANDLER_FUNCTYPE]
     _lgeos.finishGEOS_r.argtypes = [c_void_p]
 
 # Exceptions
@@ -148,11 +149,11 @@ class PredicateError(Exception):
 
 def error_handler(fmt, list):
     LOG.error("%s", list)
-error_h = CFUNCTYPE(None, c_char_p, c_char_p)(error_handler)
+error_h = EXCEPTION_HANDLER_FUNCTYPE(error_handler)
 
 def notice_handler(fmt, list):
     LOG.warning("%s", list)
-notice_h = CFUNCTYPE(None, c_char_p, c_char_p)(notice_handler)
+notice_h = EXCEPTION_HANDLER_FUNCTYPE(notice_handler)
 
 def cleanup():
     if _lgeos is not None :
@@ -166,7 +167,7 @@ def errcheck_wkb(result, func, argtuple):
     if not result:
         return None
     size_ref = argtuple[-1]
-    size = size_ref._obj
+    size = size_ref.contents
     retval = ctypes.string_at(result, size.value)[:]
     lgeos.GEOSFree(result)
     return retval

{Shapely-1.2.10 → Shapely-1.2.12}/shapely/predicates.py

@@ -7,13 +7,13 @@ from shapely.topology import Delegating
 class BinaryPredicate(Delegating):
     def __call__(self, this, other, *args):
         self._validate(this)
-        self._validate(other)
+        self._validate(other, stop_prepared=True)
         return self.fn(this._geom, other._geom, *args)
 
 class RelateOp(Delegating):
     def __call__(self, this, other):
         self._validate(this)
-        self._validate(other)
+        self._validate(other, stop_prepared=True)
         return self.fn(this._geom, other._geom)
 
 class UnaryPredicate(Delegating):

{Shapely-1.2.10 → Shapely-1.2.12}/shapely/prepared.py

@@ -27,7 +27,10 @@ class PreparedGeometry(object):
     
     def __del__(self):
         if self.__geom__ is not None:
-            lgeos.GEOSPreparedGeom_destroy(self.__geom__)
+            try:
+                lgeos.GEOSPreparedGeom_destroy(self.__geom__)
+            except AttributeError:
+                pass # lgeos might be empty on shutdown
         self.__geom__ = None
         self.context = None
     

{Shapely-1.2.10 → Shapely-1.2.12}/shapely/speedups/__init__.py

@@ -6,8 +6,11 @@ from shapely import coords
 try:
     from shapely.speedups import _speedups
     available = True
+    import_error_msg = None
 except ImportError:
+    import sys
     available = False
+    import_error_msg = tuple(sys.exc_info()[1])
 
 __all__ = ['available', 'enable', 'disable']
 _orig = {}

Shapely-1.2.12/shapely/tests/test_prepared.py

@@ -0,0 +1,28 @@
+import unittest
+from shapely import prepared
+from shapely import geometry
+
+
+class PreparedGeometryTestCase(unittest.TestCase):
+    
+    def test_prepared(self):
+        polygon = geometry.Polygon([
+            (0, 0), (1, 0), (1, 1), (0, 1)
+        ])
+        p = prepared.PreparedGeometry(polygon)
+        self.assertTrue(p.contains(geometry.Point(0.5, 0.5)))
+        self.assertFalse(p.contains(geometry.Point(0.5, 1.5)))
+
+    def test_op_not_allowed(self):
+        p = prepared.PreparedGeometry(geometry.Point(0.0, 0.0).buffer(1.0))
+        self.assertRaises(ValueError, geometry.Point(0.0, 0.0).union, p)
+
+    def test_predicate_not_allowed(self):
+        p = prepared.PreparedGeometry(geometry.Point(0.0, 0.0).buffer(1.0))
+        self.assertRaises(ValueError, geometry.Point(0.0, 0.0).contains, p)
+
+
+def test_suite():
+    return unittest.TestLoader().loadTestsFromTestCase(
+                                    PreparedGeometryTestCase
+                                    )

{Shapely-1.2.10 → Shapely-1.2.12}/shapely/topology.py

@@ -10,14 +10,12 @@ These methods return ctypes objects that should be recast by the caller.
 from ctypes import byref, c_double
 from shapely.geos import TopologicalError, lgeos
 
-
 class Validating(object):
-    def _validate(self, ob):
-        try:
-            assert ob is not None
-            assert ob._geom is not None
-        except AssertionError:
+    def _validate(self, ob, stop_prepared=False):
+        if ob is None or ob._geom is None:
             raise ValueError("Null geometry supports no operations")
+        if stop_prepared and not hasattr(ob, 'type'):
+            raise ValueError("Prepared geometries cannot be operated on")
 
 class Delegating(Validating):
     def __init__(self, name):
@@ -26,7 +24,7 @@ class Delegating(Validating):
 class BinaryRealProperty(Delegating):
     def __call__(self, this, other):
         self._validate(this)
-        self._validate(other)
+        self._validate(other, stop_prepared=True)
         d = c_double()
         retval = self.fn(this._geom, other._geom, byref(d))
         return d.value
@@ -41,7 +39,7 @@ class UnaryRealProperty(Delegating):
 class BinaryTopologicalOp(Delegating):
     def __call__(self, this, other, *args):
         self._validate(this)
-        self._validate(other)
+        self._validate(other, stop_prepared=True)
         product = self.fn(this._geom, other._geom, *args)
         if product is None:
             if not this.is_valid:

{Shapely-1.2.10 → Shapely-1.2.12}/shapely/wkb.py

@@ -1,7 +1,7 @@
 """Load/dump geometries using the well-known binary (WKB) format
 """
 
-from ctypes import byref, c_size_t, c_char_p, c_void_p
+from ctypes import pointer, c_size_t, c_char_p, c_void_p
 
 from shapely.geos import lgeos, ReadingError
 
@@ -30,7 +30,7 @@ def dumps(ob):
     if ob is None or ob._geom is None:
         raise ValueError("Null geometry supports no operations")
     size = c_size_t()
-    return lgeos.GEOSGeomToWKB_buf(c_void_p(ob._geom), byref(size))
+    return lgeos.GEOSGeomToWKB_buf(c_void_p(ob._geom), pointer(size))
 
 def dump(ob, fp):
     """Dump a geometry to an open file."""

Shapely-1.2.10/shapely/tests/test_prepared.py

@@ -1,15 +0,0 @@
-import unittest
-from shapely import prepared
-from shapely import geometry
-
-
-class PreparedGeometryTestCase(unittest.TestCase):
-    
-    def test_prepared(self):
-        p = prepared.PreparedGeometry(geometry.Point(0.0, 0.0))
-
-
-def test_suite():
-    return unittest.TestLoader().loadTestsFromTestCase(
-                                    PreparedGeometryTestCase
-                                    )