shapely 1.0.12__tar.gz → 1.0.14__tar.gz

{Shapely-1.0.12 → Shapely-1.0.14}/CHANGES.txt

@@ -1,5 +1,15 @@
 All tickets are children of http://trac.gispython.org/lab/ticket.
 
+1.0.14 (2009-10-05)
+-------------------
+- Proper prototyping of WKB writer, and avoidance of errors on 64-bit systems
+  (#191).
+
+1.0.13 (2009-09-29)
+-------------------
+- Prototype libgeos_c functions in a way that lets py2exe apps import shapely
+  (#189).
+  
 1.0.12 (2009-04-09)
 -------------------
 - Fix for references held by topology and predicate descriptors.

{Shapely-1.0.12 → Shapely-1.0.14}/CREDITS.txt

@@ -5,5 +5,5 @@ Frédéric Junod (Camptocamp SA)
 Eric Lemoine (Camptocamp SA)
 Justin Bronn (GeoDjango) for ctypes inspiration
 
-Some of this work was supported by a grant from the U.S. National Endowment for
-the Humanities (http://www.neh.gov).
+Some of this work was supported by a grant from the U.S. National Endowment 
+for the Humanities (http://www.neh.gov).

Shapely-1.0.14/MANIFEST.in

@@ -0,0 +1,2 @@
+include *.txt
+recursive-include examples *.py

{Shapely-1.0.12 → Shapely-1.0.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: Shapely
-Version: 1.0.12
+Version: 1.0.14
 Summary: Geospatial geometries, predicates, and operations
 Home-page: http://trac.gispython.org/lab/wiki/Shapely
 Author: Sean Gillies
@@ -19,7 +19,7 @@ Description: Shapely
         * Shapely manual_
         
         Shapely requires Python 2.4+. (I've also begun to port it to Python 3.0:
-        http://zcologia.com/news/564/shapely-for-python-3-0/.)
+        http://sgillies.net/blog/564/shapely-for-python-3-0/.)
         
         .. note::
         We've switched to Windows GEOS DLLs based on MinGW in versions >= 1.0.6.
@@ -27,8 +27,8 @@ Description: Shapely
         
         See also CHANGES.txt_ and HISTORY.txt_.
         
-        .. _CHANGES.txt: http://trac.gispython.org/projects/PCL/browser/Shapely/trunk/CHANGES.txt
-        .. _HISTORY.txt: http://trac.gispython.org/projects/PCL/browser/Shapely/trunk/HISTORY.txt
+        .. _CHANGES.txt: http://trac.gispython.org/lab/browser/Shapely/trunk/CHANGES.txt
+        .. _HISTORY.txt: http://trac.gispython.org/lab/browser/Shapely/trunk/HISTORY.txt
         .. _WorldMill: http://pypi.python.org/pypi/WorldMill
         .. _pyproj: http://pypi.python.org/pypi/pyproj
         
@@ -51,17 +51,10 @@ Description: Shapely
         
         $ sudo easy_install Shapely
         
-        with the setup script::
+        or with the setup script::
         
         $ sudo python setup.py install
         
-        or by using the development buildout on Linux, which also provides libgeos_c::
-        
-        $ svn co http://svn.gispython.org/svn/gispy/buildout/shapely.buildout/trunk shapely.buildout
-        $ cd shapely.buildout
-        $ python bootstrap.py
-        $ ./bin/buildout
-        
         
         Usage
         -----
@@ -124,7 +117,7 @@ Description: Shapely
         >>> tuple(shape.coords)
         ((0.0, 0.0),)
         
-        See http://trac.gispython.org/projects/PCL/wiki/PythonGeoInterface for more
+        See http://trac.gispython.org/lab/wiki/PythonGeoInterface for more
         details on the interface.
         
         
@@ -148,7 +141,7 @@ Description: Shapely
         
         For current information about this project, see the wiki_.
         
-        .. _wiki: http://trac.gispython.org/projects/PCL/wiki/Shapely
+        .. _wiki: http://trac.gispython.org/lab/wiki/Shapely
         .. _manual: http://gispython.org/shapely/manual.html
         
         If you have questions, please consider joining our community list:

{Shapely-1.0.12 → Shapely-1.0.14}/README.txt

@@ -11,7 +11,7 @@ to other packages like WorldMill_ and pyproj_. For more information, see:
 * Shapely manual_
 
 Shapely requires Python 2.4+. (I've also begun to port it to Python 3.0:
-http://zcologia.com/news/564/shapely-for-python-3-0/.)
+http://sgillies.net/blog/564/shapely-for-python-3-0/.)
 
 .. note::
    We've switched to Windows GEOS DLLs based on MinGW in versions >= 1.0.6.
@@ -19,8 +19,8 @@ http://zcologia.com/news/564/shapely-for-python-3-0/.)
 
 See also CHANGES.txt_ and HISTORY.txt_.
 
-.. _CHANGES.txt: http://trac.gispython.org/projects/PCL/browser/Shapely/trunk/CHANGES.txt
-.. _HISTORY.txt: http://trac.gispython.org/projects/PCL/browser/Shapely/trunk/HISTORY.txt
+.. _CHANGES.txt: http://trac.gispython.org/lab/browser/Shapely/trunk/CHANGES.txt
+.. _HISTORY.txt: http://trac.gispython.org/lab/browser/Shapely/trunk/HISTORY.txt
 .. _WorldMill: http://pypi.python.org/pypi/WorldMill
 .. _pyproj: http://pypi.python.org/pypi/pyproj
 
@@ -43,17 +43,10 @@ is on the system library path, and install from the Python package index::
 
   $ sudo easy_install Shapely
 
-with the setup script::
+or with the setup script::
 
   $ sudo python setup.py install
 
-or by using the development buildout on Linux, which also provides libgeos_c::
-
-  $ svn co http://svn.gispython.org/svn/gispy/buildout/shapely.buildout/trunk shapely.buildout
-  $ cd shapely.buildout
-  $ python bootstrap.py
-  $ ./bin/buildout
-
 
 Usage
 -----
@@ -116,7 +109,7 @@ geometry with the asShape factory::
   >>> tuple(shape.coords)
   ((0.0, 0.0),)
 
-See http://trac.gispython.org/projects/PCL/wiki/PythonGeoInterface for more
+See http://trac.gispython.org/lab/wiki/PythonGeoInterface for more
 details on the interface.
 
 
@@ -140,7 +133,7 @@ Support
 
 For current information about this project, see the wiki_.
 
-.. _wiki: http://trac.gispython.org/projects/PCL/wiki/Shapely
+.. _wiki: http://trac.gispython.org/lab/wiki/Shapely
 .. _manual: http://gispython.org/shapely/manual.html
 
 If you have questions, please consider joining our community list:

{Shapely-1.0.12 → Shapely-1.0.14}/Shapely.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: Shapely
-Version: 1.0.12
+Version: 1.0.14
 Summary: Geospatial geometries, predicates, and operations
 Home-page: http://trac.gispython.org/lab/wiki/Shapely
 Author: Sean Gillies
@@ -19,7 +19,7 @@ Description: Shapely
         * Shapely manual_
         
         Shapely requires Python 2.4+. (I've also begun to port it to Python 3.0:
-        http://zcologia.com/news/564/shapely-for-python-3-0/.)
+        http://sgillies.net/blog/564/shapely-for-python-3-0/.)
         
         .. note::
         We've switched to Windows GEOS DLLs based on MinGW in versions >= 1.0.6.
@@ -27,8 +27,8 @@ Description: Shapely
         
         See also CHANGES.txt_ and HISTORY.txt_.
         
-        .. _CHANGES.txt: http://trac.gispython.org/projects/PCL/browser/Shapely/trunk/CHANGES.txt
-        .. _HISTORY.txt: http://trac.gispython.org/projects/PCL/browser/Shapely/trunk/HISTORY.txt
+        .. _CHANGES.txt: http://trac.gispython.org/lab/browser/Shapely/trunk/CHANGES.txt
+        .. _HISTORY.txt: http://trac.gispython.org/lab/browser/Shapely/trunk/HISTORY.txt
         .. _WorldMill: http://pypi.python.org/pypi/WorldMill
         .. _pyproj: http://pypi.python.org/pypi/pyproj
         
@@ -51,17 +51,10 @@ Description: Shapely
         
         $ sudo easy_install Shapely
         
-        with the setup script::
+        or with the setup script::
         
         $ sudo python setup.py install
         
-        or by using the development buildout on Linux, which also provides libgeos_c::
-        
-        $ svn co http://svn.gispython.org/svn/gispy/buildout/shapely.buildout/trunk shapely.buildout
-        $ cd shapely.buildout
-        $ python bootstrap.py
-        $ ./bin/buildout
-        
         
         Usage
         -----
@@ -124,7 +117,7 @@ Description: Shapely
         >>> tuple(shape.coords)
         ((0.0, 0.0),)
         
-        See http://trac.gispython.org/projects/PCL/wiki/PythonGeoInterface for more
+        See http://trac.gispython.org/lab/wiki/PythonGeoInterface for more
         details on the interface.
         
         
@@ -148,7 +141,7 @@ Description: Shapely
         
         For current information about this project, see the wiki_.
         
-        .. _wiki: http://trac.gispython.org/projects/PCL/wiki/Shapely
+        .. _wiki: http://trac.gispython.org/lab/wiki/Shapely
         .. _manual: http://gispython.org/shapely/manual.html
         
         If you have questions, please consider joining our community list:

{Shapely-1.0.12 → Shapely-1.0.14}/Shapely.egg-info/SOURCES.txt

@@ -3,6 +3,7 @@ CREDITS.txt
 GEOS-C-API.txt
 HISTORY.txt
 LICENSE.txt
+MANIFEST.in
 README.txt
 setup.py
 setup_windows.py
@@ -57,4 +58,4 @@ tests/rungrind.dist
 tests/test_doctests.py
 tests/test_threads.py
 tests/valgrind-python.supp
-tests/wkt_locale.txt
+tests/wkt_locale.txt

Shapely-1.0.14/Shapely.egg-info/requires.txt

@@ -0,0 +1,2 @@
+setuptools
+ctypes

{Shapely-1.0.12 → Shapely-1.0.14}/setup.py

@@ -10,7 +10,7 @@ if version_info[:2] < (2,5):
 readme_text = file('README.txt', 'rb').read()
 
 setup(name          = 'Shapely',
-      version       = '1.0.12',
+      version       = '1.0.14',
       description   = 'Geospatial geometries, predicates, and operations',
       license       = 'BSD',
       keywords      = 'geometry topology',

{Shapely-1.0.12 → Shapely-1.0.14}/setup_windows.py

@@ -10,7 +10,7 @@ if version_info[:2] < (2,5):
 readme_text = file('README.txt', 'rb').read()
 
 setup(name          = 'Shapely',
-      version       = '1.0.12',
+      version       = '1.0.14',
       description   = 'Geospatial geometries, predicates, and operations',
       license       = 'BSD',
       keywords      = 'geometry topology',

Shapely-1.0.14/shapely/ctypes_declarations.py

@@ -0,0 +1,212 @@
+# Prototyping of libgeos_c functions, now using a function written by
+# `tartley`: http://trac.gispython.org/lab/ticket/189
+
+import ctypes
+
+def prototype(lgeos):
+
+    lgeos.initGEOS.restype = None
+
+    lgeos.finishGEOS.restype = None
+
+    lgeos.GEOSversion.restype = ctypes.c_char_p
+
+    lgeos.GEOSGeomFromWKT.restype = ctypes.c_void_p
+    lgeos.GEOSGeomFromWKT.argtypes = [ctypes.c_char_p]
+
+    lgeos.GEOSGeomToWKT.restype = ctypes.c_char_p
+    lgeos.GEOSGeomToWKT.argtypes = [ctypes.c_void_p]
+
+    lgeos.GEOS_setWKBOutputDims.restype = ctypes.c_int
+    lgeos.GEOS_setWKBOutputDims.argtypes = [ctypes.c_int]
+
+    lgeos.GEOSGeomFromWKB_buf.restype = ctypes.c_void_p
+    lgeos.GEOSGeomFromWKB_buf.argtypes = [ctypes.c_void_p, ctypes.c_size_t]
+
+    lgeos.GEOSGeomToWKB_buf.restype = ctypes.c_void_p
+    lgeos.GEOSGeomToWKB_buf.argtypes = [ctypes.c_void_p , ctypes.POINTER(ctypes.c_size_t)]
+
+
+    lgeos.GEOSCoordSeq_create.restype = ctypes.c_void_p
+    lgeos.GEOSCoordSeq_create.argtypes = [ctypes.c_uint, ctypes.c_uint]
+
+    lgeos.GEOSCoordSeq_clone.restype = ctypes.c_void_p
+    lgeos.GEOSCoordSeq_clone.argtypes = [ctypes.c_void_p]
+
+    lgeos.GEOSCoordSeq_destroy.restype = None
+    lgeos.GEOSCoordSeq_destroy.argtypes = [ctypes.c_void_p]
+
+    lgeos.GEOSCoordSeq_setX.restype = ctypes.c_int
+    lgeos.GEOSCoordSeq_setX.argtypes = [ctypes.c_void_p, ctypes.c_uint, ctypes.c_double]
+
+    lgeos.GEOSCoordSeq_setY.restype = ctypes.c_int
+    lgeos.GEOSCoordSeq_setY.argtypes = [ctypes.c_void_p, ctypes.c_uint, ctypes.c_double]
+
+    lgeos.GEOSCoordSeq_setZ.restype = ctypes.c_int
+    lgeos.GEOSCoordSeq_setZ.argtypes = [ctypes.c_void_p, ctypes.c_uint, ctypes.c_double]
+
+    lgeos.GEOSCoordSeq_setOrdinate.restype = ctypes.c_int
+    lgeos.GEOSCoordSeq_setOrdinate.argtypes = [ctypes.c_void_p, ctypes.c_uint, ctypes.c_uint, ctypes.c_double]
+
+    lgeos.GEOSCoordSeq_getX.restype = ctypes.c_int
+    lgeos.GEOSCoordSeq_getX.argtypes = [ctypes.c_void_p, ctypes.c_uint, ctypes.c_void_p]
+
+    lgeos.GEOSCoordSeq_getY.restype = ctypes.c_int
+    lgeos.GEOSCoordSeq_getY.argtypes = [ctypes.c_void_p, ctypes.c_uint, ctypes.c_void_p]
+
+    lgeos.GEOSCoordSeq_getZ.restype = ctypes.c_int
+    lgeos.GEOSCoordSeq_getZ.argtypes = [ctypes.c_void_p, ctypes.c_uint, ctypes.c_void_p]
+
+    lgeos.GEOSCoordSeq_getSize.restype = ctypes.c_int
+    lgeos.GEOSCoordSeq_getSize.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
+
+    lgeos.GEOSCoordSeq_getDimensions.restype = ctypes.c_int
+    lgeos.GEOSCoordSeq_getDimensions.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
+
+    lgeos.GEOSGeom_createPoint.restype = ctypes.c_void_p
+    lgeos.GEOSGeom_createPoint.argtypes = [ctypes.c_void_p]
+
+    lgeos.GEOSGeom_createLinearRing.restype = ctypes.c_void_p
+    lgeos.GEOSGeom_createLinearRing.argtypes = [ctypes.c_void_p]
+
+    lgeos.GEOSGeom_createLineString.restype = ctypes.c_void_p
+    lgeos.GEOSGeom_createLineString.argtypes = [ctypes.c_void_p]
+
+    lgeos.GEOSGeom_createPolygon.restype = ctypes.c_void_p
+    lgeos.GEOSGeom_createPolygon.argtypes = [ctypes.c_void_p, ctypes.c_void_p, ctypes.c_uint]
+
+    lgeos.GEOSGeom_createCollection.restype = ctypes.c_void_p
+    lgeos.GEOSGeom_createCollection.argtypes = [ctypes.c_int, ctypes.c_void_p, ctypes.c_uint]
+
+    lgeos.GEOSGeom_clone.restype = ctypes.c_void_p
+    lgeos.GEOSGeom_clone.argtypes = [ctypes.c_void_p]
+
+    lgeos.GEOSGeom_destroy.restype = None
+    lgeos.GEOSGeom_destroy.argtypes = [ctypes.c_void_p]
+
+    lgeos.GEOSEnvelope.restype = ctypes.c_void_p
+    lgeos.GEOSEnvelope.argtypes = [ctypes.c_void_p]
+
+    lgeos.GEOSIntersection.restype = ctypes.c_void_p
+    lgeos.GEOSIntersection.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
+
+    lgeos.GEOSBuffer.restype = ctypes.c_void_p
+    lgeos.GEOSBuffer.argtypes = [ctypes.c_void_p, ctypes.c_double, ctypes.c_int]
+
+    lgeos.GEOSConvexHull.restype = ctypes.c_void_p
+    lgeos.GEOSConvexHull.argtypes = [ctypes.c_void_p]
+
+    lgeos.GEOSDifference.restype = ctypes.c_void_p
+    lgeos.GEOSDifference.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
+
+    lgeos.GEOSSymDifference.restype = ctypes.c_void_p
+    lgeos.GEOSSymDifference.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
+
+    lgeos.GEOSBoundary.restype = ctypes.c_void_p
+    lgeos.GEOSBoundary.argtypes = [ctypes.c_void_p]
+
+    lgeos.GEOSUnion.restype = ctypes.c_void_p
+    lgeos.GEOSUnion.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
+
+    lgeos.GEOSPointOnSurface.restype = ctypes.c_void_p
+    lgeos.GEOSPointOnSurface.argtypes = [ctypes.c_void_p]
+
+    lgeos.GEOSGetCentroid.restype = ctypes.c_void_p
+    lgeos.GEOSGetCentroid.argtypes = [ctypes.c_void_p]
+
+    lgeos.GEOSRelate.restype = ctypes.c_char_p
+    lgeos.GEOSRelate.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
+
+    lgeos.GEOSPolygonize.restype = ctypes.c_void_p
+    lgeos.GEOSPolygonize.argtypes = [ctypes.c_void_p, ctypes.c_uint]
+
+    lgeos.GEOSLineMerge.restype = ctypes.c_void_p
+    lgeos.GEOSLineMerge.argtypes = [ctypes.c_void_p]
+
+    lgeos.GEOSRelatePattern.restype = ctypes.c_char
+    lgeos.GEOSRelatePattern.argtypes = [ctypes.c_void_p, ctypes.c_void_p, ctypes.c_char_p]
+
+    lgeos.GEOSDisjoint.restype = ctypes.c_int
+    lgeos.GEOSDisjoint.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
+
+    lgeos.GEOSTouches.restype = ctypes.c_int
+    lgeos.GEOSTouches.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
+
+    lgeos.GEOSIntersects.restype = ctypes.c_int
+    lgeos.GEOSIntersects.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
+
+    lgeos.GEOSCrosses.restype = ctypes.c_int
+    lgeos.GEOSCrosses.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
+
+    lgeos.GEOSWithin.restype = ctypes.c_int
+    lgeos.GEOSWithin.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
+
+    lgeos.GEOSContains.restype = ctypes.c_int
+    lgeos.GEOSContains.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
+
+    lgeos.GEOSOverlaps.restype = ctypes.c_int
+    lgeos.GEOSOverlaps.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
+
+    lgeos.GEOSEquals.restype = ctypes.c_int
+    lgeos.GEOSEquals.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
+
+    lgeos.GEOSisEmpty.restype = ctypes.c_int
+    lgeos.GEOSisEmpty.argtypes = [ctypes.c_void_p]
+
+    lgeos.GEOSisValid.restype = ctypes.c_int
+    lgeos.GEOSisValid.argtypes = [ctypes.c_void_p]
+
+    lgeos.GEOSisSimple.restype = ctypes.c_int
+    lgeos.GEOSisSimple.argtypes = [ctypes.c_void_p]
+
+    lgeos.GEOSisRing.restype = ctypes.c_int
+    lgeos.GEOSisRing.argtypes = [ctypes.c_void_p]
+
+    lgeos.GEOSHasZ.restype = ctypes.c_int
+    lgeos.GEOSHasZ.argtypes = [ctypes.c_void_p]
+
+    lgeos.GEOSGeomType.restype = ctypes.c_char_p
+    lgeos.GEOSGeomType.argtypes = [ctypes.c_void_p]
+
+    lgeos.GEOSGeomTypeId.restype = ctypes.c_int
+    lgeos.GEOSGeomTypeId.argtypes = [ctypes.c_void_p]
+
+    lgeos.GEOSGetSRID.restype = ctypes.c_int
+    lgeos.GEOSGetSRID.argtypes = [ctypes.c_void_p]
+
+    lgeos.GEOSSetSRID.restype = None
+    lgeos.GEOSSetSRID.argtypes = [ctypes.c_void_p, ctypes.c_int]
+
+    lgeos.GEOSGetNumGeometries.restype = ctypes.c_int
+    lgeos.GEOSGetNumGeometries.argtypes = [ctypes.c_void_p]
+
+    lgeos.GEOSGetGeometryN.restype = ctypes.c_void_p
+    lgeos.GEOSGetGeometryN.argtypes = [ctypes.c_void_p, ctypes.c_int]
+
+    lgeos.GEOSGetNumInteriorRings.restype = ctypes.c_int
+    lgeos.GEOSGetNumInteriorRings.argtypes = [ctypes.c_void_p]
+
+    lgeos.GEOSGetInteriorRingN.restype = ctypes.c_void_p
+    lgeos.GEOSGetInteriorRingN.argtypes = [ctypes.c_void_p, ctypes.c_int]
+
+    lgeos.GEOSGetExteriorRing.restype = ctypes.c_void_p
+    lgeos.GEOSGetExteriorRing.argtypes = [ctypes.c_void_p]
+
+    lgeos.GEOSGetNumCoordinates.restype = ctypes.c_int
+    lgeos.GEOSGetNumCoordinates.argtypes = [ctypes.c_void_p]
+
+    lgeos.GEOSGeom_getCoordSeq.restype = ctypes.c_void_p
+    lgeos.GEOSGeom_getCoordSeq.argtypes = [ctypes.c_void_p]
+
+    lgeos.GEOSGeom_getDimensions.restype = ctypes.c_int
+    lgeos.GEOSGeom_getDimensions.argtypes = [ctypes.c_void_p]
+
+    lgeos.GEOSArea.restype = ctypes.c_double
+    lgeos.GEOSArea.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
+
+    lgeos.GEOSLength.restype = ctypes.c_int
+    lgeos.GEOSLength.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
+
+    lgeos.GEOSDistance.restype = ctypes.c_int
+    lgeos.GEOSDistance.argtypes = [ctypes.c_void_p, ctypes.c_void_p, ctypes.c_void_p]
+

{Shapely-1.0.12 → Shapely-1.0.14}/shapely/geometry/base.py

@@ -2,7 +2,7 @@
 Base geometry class and utilities.
 """
 
-from ctypes import string_at, byref, c_int, c_size_t, c_char_p, c_double
+from ctypes import string_at, byref, c_int, c_size_t, c_char_p, c_double, c_void_p
 import sys
 
 from shapely.geos import lgeos, free, allocated_c_char_p
@@ -349,13 +349,14 @@ class BaseGeometry(object):
     def to_wkb(self):
         """Returns a WKB byte string representation of the geometry."""
         func = lgeos.GEOSGeomToWKB_buf
-        size = c_int()
+        size = c_size_t()
         def errcheck(result, func, argtuple):
+            if not result: return None
             retval = string_at(result, size.value)[:]
             free(result)
             return retval
         func.errcheck = errcheck
-        return func(self._geom, byref(size))
+        return func(c_void_p(self._geom), byref(size))
 
     @exceptNull
     def to_wkt(self):

{Shapely-1.0.12 → Shapely-1.0.14}/shapely/geos.py

@@ -3,10 +3,13 @@ Exports the libgeos_c shared lib, GEOS-specific exceptions, and utilities.
 """
 
 import atexit
+from ctypes import cdll, CDLL, PyDLL, CFUNCTYPE, c_char_p, c_void_p
+from ctypes.util import find_library
 import os
 import sys
-from ctypes import cdll, CDLL, PyDLL, CFUNCTYPE, c_char_p
-from ctypes.util import find_library
+
+from ctypes_declarations import prototype
+
 
 if sys.platform == 'win32':
     try:
@@ -40,6 +43,8 @@ elif sys.platform == 'darwin':
         raise ImportError, "Could not find geos_c library"
     lgeos = PyDLL(lib)
     free = CDLL(find_library('libc')).free
+    free.argtypes=[c_void_p]
+    free.restype=None
 else:
     # Try the major versioned name first, falling back on the unversioned name.
     try:
@@ -49,16 +54,17 @@ else:
     except:
         raise
     free = CDLL('libc.so.6').free
+    free.argtypes=[c_void_p]
+    free.restype=None
 
+# Prototype the libgeos_c functions using new code from `tarley` in
+# http://trac.gispython.org/lab/ticket/189
+prototype(lgeos)
 
-# Load the ctypes restype and argtype declarations for geos_c functions.
-_here = os.path.abspath(os.path.dirname(__file__))
-execfile(os.path.join(_here, 'ctypes_declarations.py'))
 
 class allocated_c_char_p(c_char_p):
     pass
 
-
 # Exceptions
 
 class ReadingError(Exception):

{Shapely-1.0.12 → Shapely-1.0.14}/shapely/wkb.py

@@ -3,6 +3,7 @@ Load/dump geometries using the well-known binary (WKB) format.
 """
 
 from ctypes import byref, c_int, c_size_t, c_char_p, string_at
+from ctypes import c_void_p, c_size_t
 
 from shapely.geos import lgeos, free, ReadingError
 from shapely.geometry.base import geom_factory
@@ -26,13 +27,14 @@ def load(fp):
 def dumps(ob):
     """Dump a WKB representation of a geometry to a byte string."""
     func = lgeos.GEOSGeomToWKB_buf
-    size = c_int()
+    size = c_size_t()
     def errcheck(result, func, argtuple):
+        if not result: return None
         retval = string_at(result, size.value)[:]
         free(result)
         return retval
     func.errcheck = errcheck
-    return func(ob._geom, byref(size))
+    return func(c_void_p(ob._geom), byref(size))
 
 def dump(ob, fp):
     """Dump a geometry to an open file."""

{Shapely-1.0.12 → Shapely-1.0.14}/tests/wkt_locale.txt

@@ -3,9 +3,11 @@ Test locale independence of WKT
 
 Set locale to one that uses a comma as decimal seperator`
 
-  >>> import locale
-  >>> locale.setlocale(locale.LC_ALL, 'pt_BR.UTF-8')
-  'pt_BR.UTF-8'
+  >>> import locale, sys
+  >>> if sys.platform == 'win32':
+  ...     _ = locale.setlocale(locale.LC_ALL, 'portuguese-brazil')
+  ... else:
+  ...     _ = locale.setlocale(locale.LC_ALL, 'pt_BR.UTF-8')
 
 Test reading and writing`
 

Shapely-1.0.12/Shapely.egg-info/requires.txt

@@ -1 +0,0 @@
-setuptools

Shapely-1.0.12/shapely/ctypes_declarations.py

@@ -1,204 +0,0 @@
-import ctypes
-
-lgeos = lgeos   # reduce pyflakes complaints
-
-lgeos.initGEOS.restype = None
-
-lgeos.finishGEOS.restype = None
-
-lgeos.GEOSversion.restype = ctypes.c_char_p
-
-lgeos.GEOSGeomFromWKT.restype = ctypes.c_void_p
-lgeos.GEOSGeomFromWKT.argtypes = [ctypes.c_char_p]
-
-lgeos.GEOSGeomToWKT.restype = ctypes.c_char_p
-lgeos.GEOSGeomToWKT.argtypes = [ctypes.c_void_p]
-
-lgeos.GEOS_setWKBOutputDims.restype = ctypes.c_int
-lgeos.GEOS_setWKBOutputDims.argtypes = [ctypes.c_int]
-
-lgeos.GEOSGeomFromWKB_buf.restype = ctypes.c_void_p
-lgeos.GEOSGeomFromWKB_buf.argtypes = [ctypes.c_void_p, ctypes.c_size_t]
-
-lgeos.GEOSCoordSeq_create.restype = ctypes.c_void_p
-lgeos.GEOSCoordSeq_create.argtypes = [ctypes.c_uint, ctypes.c_uint]
-
-lgeos.GEOSCoordSeq_clone.restype = ctypes.c_void_p
-lgeos.GEOSCoordSeq_clone.argtypes = [ctypes.c_void_p]
-
-lgeos.GEOSCoordSeq_destroy.restype = None
-lgeos.GEOSCoordSeq_destroy.argtypes = [ctypes.c_void_p]
-
-lgeos.GEOSCoordSeq_setX.restype = ctypes.c_int
-lgeos.GEOSCoordSeq_setX.argtypes = [ctypes.c_void_p, ctypes.c_uint, ctypes.c_double]
-
-lgeos.GEOSCoordSeq_setY.restype = ctypes.c_int
-lgeos.GEOSCoordSeq_setY.argtypes = [ctypes.c_void_p, ctypes.c_uint, ctypes.c_double]
-
-lgeos.GEOSCoordSeq_setZ.restype = ctypes.c_int
-lgeos.GEOSCoordSeq_setZ.argtypes = [ctypes.c_void_p, ctypes.c_uint, ctypes.c_double]
-
-lgeos.GEOSCoordSeq_setOrdinate.restype = ctypes.c_int
-lgeos.GEOSCoordSeq_setOrdinate.argtypes = [ctypes.c_void_p, ctypes.c_uint, ctypes.c_uint, ctypes.c_double]
-
-lgeos.GEOSCoordSeq_getX.restype = ctypes.c_int
-lgeos.GEOSCoordSeq_getX.argtypes = [ctypes.c_void_p, ctypes.c_uint, ctypes.c_void_p]
-
-lgeos.GEOSCoordSeq_getY.restype = ctypes.c_int
-lgeos.GEOSCoordSeq_getY.argtypes = [ctypes.c_void_p, ctypes.c_uint, ctypes.c_void_p]
-
-lgeos.GEOSCoordSeq_getZ.restype = ctypes.c_int
-lgeos.GEOSCoordSeq_getZ.argtypes = [ctypes.c_void_p, ctypes.c_uint, ctypes.c_void_p]
-
-lgeos.GEOSCoordSeq_getSize.restype = ctypes.c_int
-lgeos.GEOSCoordSeq_getSize.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
-
-lgeos.GEOSCoordSeq_getDimensions.restype = ctypes.c_int
-lgeos.GEOSCoordSeq_getDimensions.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
-
-lgeos.GEOSGeom_createPoint.restype = ctypes.c_void_p
-lgeos.GEOSGeom_createPoint.argtypes = [ctypes.c_void_p]
-
-lgeos.GEOSGeom_createLinearRing.restype = ctypes.c_void_p
-lgeos.GEOSGeom_createLinearRing.argtypes = [ctypes.c_void_p]
-
-lgeos.GEOSGeom_createLineString.restype = ctypes.c_void_p
-lgeos.GEOSGeom_createLineString.argtypes = [ctypes.c_void_p]
-
-lgeos.GEOSGeom_createPolygon.restype = ctypes.c_void_p
-lgeos.GEOSGeom_createPolygon.argtypes = [ctypes.c_void_p, ctypes.c_void_p, ctypes.c_uint]
-
-lgeos.GEOSGeom_createCollection.restype = ctypes.c_void_p
-lgeos.GEOSGeom_createCollection.argtypes = [ctypes.c_int, ctypes.c_void_p, ctypes.c_uint]
-
-lgeos.GEOSGeom_clone.restype = ctypes.c_void_p
-lgeos.GEOSGeom_clone.argtypes = [ctypes.c_void_p]
-
-lgeos.GEOSGeom_destroy.restype = None
-lgeos.GEOSGeom_destroy.argtypes = [ctypes.c_void_p]
-
-lgeos.GEOSEnvelope.restype = ctypes.c_void_p
-lgeos.GEOSEnvelope.argtypes = [ctypes.c_void_p]
-
-lgeos.GEOSIntersection.restype = ctypes.c_void_p
-lgeos.GEOSIntersection.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
-
-lgeos.GEOSBuffer.restype = ctypes.c_void_p
-lgeos.GEOSBuffer.argtypes = [ctypes.c_void_p, ctypes.c_double, ctypes.c_int]
-
-lgeos.GEOSConvexHull.restype = ctypes.c_void_p
-lgeos.GEOSConvexHull.argtypes = [ctypes.c_void_p]
-
-lgeos.GEOSDifference.restype = ctypes.c_void_p
-lgeos.GEOSDifference.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
-
-lgeos.GEOSSymDifference.restype = ctypes.c_void_p
-lgeos.GEOSSymDifference.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
-
-lgeos.GEOSBoundary.restype = ctypes.c_void_p
-lgeos.GEOSBoundary.argtypes = [ctypes.c_void_p]
-
-lgeos.GEOSUnion.restype = ctypes.c_void_p
-lgeos.GEOSUnion.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
-
-lgeos.GEOSPointOnSurface.restype = ctypes.c_void_p
-lgeos.GEOSPointOnSurface.argtypes = [ctypes.c_void_p]
-
-lgeos.GEOSGetCentroid.restype = ctypes.c_void_p
-lgeos.GEOSGetCentroid.argtypes = [ctypes.c_void_p]
-
-lgeos.GEOSRelate.restype = ctypes.c_char_p
-lgeos.GEOSRelate.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
-
-lgeos.GEOSPolygonize.restype = ctypes.c_void_p
-lgeos.GEOSPolygonize.argtypes = [ctypes.c_void_p, ctypes.c_uint]
-
-lgeos.GEOSLineMerge.restype = ctypes.c_void_p
-lgeos.GEOSLineMerge.argtypes = [ctypes.c_void_p]
-
-lgeos.GEOSRelatePattern.restype = ctypes.c_char
-lgeos.GEOSRelatePattern.argtypes = [ctypes.c_void_p, ctypes.c_void_p, ctypes.c_char_p]
-
-lgeos.GEOSDisjoint.restype = ctypes.c_int
-lgeos.GEOSDisjoint.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
-
-lgeos.GEOSTouches.restype = ctypes.c_int
-lgeos.GEOSTouches.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
-
-lgeos.GEOSIntersects.restype = ctypes.c_int
-lgeos.GEOSIntersects.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
-
-lgeos.GEOSCrosses.restype = ctypes.c_int
-lgeos.GEOSCrosses.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
-
-lgeos.GEOSWithin.restype = ctypes.c_int
-lgeos.GEOSWithin.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
-
-lgeos.GEOSContains.restype = ctypes.c_int
-lgeos.GEOSContains.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
-
-lgeos.GEOSOverlaps.restype = ctypes.c_int
-lgeos.GEOSOverlaps.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
-
-lgeos.GEOSEquals.restype = ctypes.c_int
-lgeos.GEOSEquals.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
-
-lgeos.GEOSisEmpty.restype = ctypes.c_int
-lgeos.GEOSisEmpty.argtypes = [ctypes.c_void_p]
-
-lgeos.GEOSisValid.restype = ctypes.c_int
-lgeos.GEOSisValid.argtypes = [ctypes.c_void_p]
-
-lgeos.GEOSisSimple.restype = ctypes.c_int
-lgeos.GEOSisSimple.argtypes = [ctypes.c_void_p]
-
-lgeos.GEOSisRing.restype = ctypes.c_int
-lgeos.GEOSisRing.argtypes = [ctypes.c_void_p]
-
-lgeos.GEOSHasZ.restype = ctypes.c_int
-lgeos.GEOSHasZ.argtypes = [ctypes.c_void_p]
-
-lgeos.GEOSGeomType.restype = ctypes.c_char_p
-lgeos.GEOSGeomType.argtypes = [ctypes.c_void_p]
-
-lgeos.GEOSGeomTypeId.restype = ctypes.c_int
-lgeos.GEOSGeomTypeId.argtypes = [ctypes.c_void_p]
-
-lgeos.GEOSGetSRID.restype = ctypes.c_int
-lgeos.GEOSGetSRID.argtypes = [ctypes.c_void_p]
-
-lgeos.GEOSSetSRID.restype = None
-lgeos.GEOSSetSRID.argtypes = [ctypes.c_void_p, ctypes.c_int]
-
-lgeos.GEOSGetNumGeometries.restype = ctypes.c_int
-lgeos.GEOSGetNumGeometries.argtypes = [ctypes.c_void_p]
-
-lgeos.GEOSGetGeometryN.restype = ctypes.c_void_p
-lgeos.GEOSGetGeometryN.argtypes = [ctypes.c_void_p, ctypes.c_int]
-
-lgeos.GEOSGetNumInteriorRings.restype = ctypes.c_int
-lgeos.GEOSGetNumInteriorRings.argtypes = [ctypes.c_void_p]
-
-lgeos.GEOSGetInteriorRingN.restype = ctypes.c_void_p
-lgeos.GEOSGetInteriorRingN.argtypes = [ctypes.c_void_p, ctypes.c_int]
-
-lgeos.GEOSGetExteriorRing.restype = ctypes.c_void_p
-lgeos.GEOSGetExteriorRing.argtypes = [ctypes.c_void_p]
-
-lgeos.GEOSGetNumCoordinates.restype = ctypes.c_int
-lgeos.GEOSGetNumCoordinates.argtypes = [ctypes.c_void_p]
-
-lgeos.GEOSGeom_getCoordSeq.restype = ctypes.c_void_p
-lgeos.GEOSGeom_getCoordSeq.argtypes = [ctypes.c_void_p]
-
-lgeos.GEOSGeom_getDimensions.restype = ctypes.c_int
-lgeos.GEOSGeom_getDimensions.argtypes = [ctypes.c_void_p]
-
-lgeos.GEOSArea.restype = ctypes.c_double
-lgeos.GEOSArea.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
-
-lgeos.GEOSLength.restype = ctypes.c_int
-lgeos.GEOSLength.argtypes = [ctypes.c_void_p, ctypes.c_void_p]
-
-lgeos.GEOSDistance.restype = ctypes.c_int
-lgeos.GEOSDistance.argtypes = [ctypes.c_void_p, ctypes.c_void_p, ctypes.c_void_p]