shapely 1.3.0__tar.gz → 1.3.2__tar.gz

{Shapely-1.3.0 → Shapely-1.3.2}/CHANGES.txt

@@ -1,6 +1,15 @@
 Changes
 =======
 
+1.3.2 (2014-05-13)
+------------------
+- Let LineString() take a sequence of Points (#130).
+
+1.3.1 (2014-04-22)
+------------------
+- More reliable proxy cleanup on exit (#106).
+- More robust DLL loading on all platforms (#114).
+
 1.3.0 (2013-12-31)
 ------------------
 - Include support for Python 3.2 and 3.3 (#56), minimum version is now 2.6.

{Shapely-1.3.0 → Shapely-1.3.2}/CREDITS.txt

@@ -20,6 +20,7 @@ Patches contributed by:
 * Kelsey Jordahl (https://github.com/kjordahl)
 * Fr |eaigue| d |eaigue| ric Junod
 * Thomas Kluyver (https://github.com/takluyver)
+* William Kyngesburye (https://github.com/kyngchaos)
 * Eric Lemoine
 * Naveen Michaud-Agrawal (https://github.com/nmichaud)
 * psagers https://github.com/psagers

{Shapely-1.3.0/Shapely.egg-info → Shapely-1.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: Shapely
-Version: 1.3.0
+Version: 1.3.2
 Summary: Geometric objects, predicates, and operations
 Home-page: https://github.com/Toblerity/Shapely
 Author: Sean Gillies
@@ -124,7 +124,7 @@ Description: =======
         Development and Testing
         =======================
         
-        Dependecies for developing Shapely are listed in requirements-dev.txt. Cython
+        Dependencies for developing Shapely are listed in requirements-dev.txt. Cython
         and Numpy are not required for production installations, only for development.
         Use of a virtual environment is strongly recommended.::
         
@@ -149,7 +149,7 @@ Description: =======
         
         Bugs may be reported at https://github.com/Toblerity/Shapely.
         
-        .. include:: ../CREDITS.txt
+        
         
         .. _JTS: http://www.vividsolutions.com/jts/jtshome.htm
         .. _PostGIS: http://postgis.org
@@ -181,6 +181,7 @@ Description: =======
         * Kelsey Jordahl (https://github.com/kjordahl)
         * Fr |eaigue| d |eaigue| ric Junod
         * Thomas Kluyver (https://github.com/takluyver)
+        * William Kyngesburye (https://github.com/kyngchaos)
         * Eric Lemoine
         * Naveen Michaud-Agrawal (https://github.com/nmichaud)
         * psagers https://github.com/psagers
@@ -212,6 +213,15 @@ Description: =======
         Changes
         =======
         
+        1.3.2 (2014-05-13)
+        ------------------
+        - Let LineString() take a sequence of Points (#130).
+        
+        1.3.1 (2014-04-22)
+        ------------------
+        - More reliable proxy cleanup on exit (#106).
+        - More robust DLL loading on all platforms (#114).
+        
         1.3.0 (2013-12-31)
         ------------------
         - Include support for Python 3.2 and 3.3 (#56), minimum version is now 2.6.

{Shapely-1.3.0 → Shapely-1.3.2}/README.rst

@@ -116,7 +116,7 @@ after GeoJSON.
 Development and Testing
 =======================
 
-Dependecies for developing Shapely are listed in requirements-dev.txt. Cython
+Dependencies for developing Shapely are listed in requirements-dev.txt. Cython
 and Numpy are not required for production installations, only for development.
 Use of a virtual environment is strongly recommended.::
 
@@ -141,7 +141,7 @@ http://lists.gispython.org/mailman/listinfo/community.
 
 Bugs may be reported at https://github.com/Toblerity/Shapely.
 
-.. include:: ../CREDITS.txt
+.. include:: CREDITS.txt
 
 .. _JTS: http://www.vividsolutions.com/jts/jtshome.htm
 .. _PostGIS: http://postgis.org

{Shapely-1.3.0 → Shapely-1.3.2/Shapely.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: Shapely
-Version: 1.3.0
+Version: 1.3.2
 Summary: Geometric objects, predicates, and operations
 Home-page: https://github.com/Toblerity/Shapely
 Author: Sean Gillies
@@ -124,7 +124,7 @@ Description: =======
         Development and Testing
         =======================
         
-        Dependecies for developing Shapely are listed in requirements-dev.txt. Cython
+        Dependencies for developing Shapely are listed in requirements-dev.txt. Cython
         and Numpy are not required for production installations, only for development.
         Use of a virtual environment is strongly recommended.::
         
@@ -149,7 +149,7 @@ Description: =======
         
         Bugs may be reported at https://github.com/Toblerity/Shapely.
         
-        .. include:: ../CREDITS.txt
+        
         
         .. _JTS: http://www.vividsolutions.com/jts/jtshome.htm
         .. _PostGIS: http://postgis.org
@@ -181,6 +181,7 @@ Description: =======
         * Kelsey Jordahl (https://github.com/kjordahl)
         * Fr |eaigue| d |eaigue| ric Junod
         * Thomas Kluyver (https://github.com/takluyver)
+        * William Kyngesburye (https://github.com/kyngchaos)
         * Eric Lemoine
         * Naveen Michaud-Agrawal (https://github.com/nmichaud)
         * psagers https://github.com/psagers
@@ -212,6 +213,15 @@ Description: =======
         Changes
         =======
         
+        1.3.2 (2014-05-13)
+        ------------------
+        - Let LineString() take a sequence of Points (#130).
+        
+        1.3.1 (2014-04-22)
+        ------------------
+        - More reliable proxy cleanup on exit (#106).
+        - More robust DLL loading on all platforms (#114).
+        
         1.3.0 (2013-12-31)
         ------------------
         - Include support for Python 3.2 and 3.3 (#56), minimum version is now 2.6.

Shapely-1.3.2/VERSION.txt

@@ -0,0 +1 @@
+1.3.2

Shapely-1.3.2/shapely/__init__.py

@@ -0,0 +1 @@
+__version__ = "1.3.2"

{Shapely-1.3.0 → Shapely-1.3.2}/shapely/geometry/linestring.py

@@ -12,6 +12,7 @@ from shapely.coords import required
 from shapely.geos import lgeos, TopologicalError
 from shapely.geometry.base import BaseGeometry, geom_factory, JOIN_STYLE
 from shapely.geometry.proxy import CachingGeometryProxy
+from shapely.geometry.point import Point
 
 __all__ = ['LineString', 'asLineString']
 
@@ -221,8 +222,15 @@ def geos_linestring_from_py(ob, update_geom=None, update_ndim=0):
         if m < 2:
             raise ValueError(
                 "LineStrings must have at least 2 coordinate tuples")
+
+        def _coords(o):
+            if isinstance(o, Point):
+                return o.coords[0]
+            else:
+                return o
+
         try:
-            n = len(ob[0])
+            n = len(_coords(ob[0]))
         except TypeError:
             raise ValueError(
                 "Input %s is the wrong shape for a LineString" % str(ob))
@@ -240,7 +248,7 @@ def geos_linestring_from_py(ob, update_geom=None, update_ndim=0):
 
         # add to coordinate sequence
         for i in range(m):
-            coords = ob[i]
+            coords = _coords(ob[i])
             # Because of a bug in the GEOS C API,
             # always set X before Y
             lgeos.GEOSCoordSeq_setX(cs, i, coords[0])

{Shapely-1.3.0 → Shapely-1.3.2}/shapely/geos.py

@@ -36,19 +36,22 @@ else:
 def load_dll(libname, fallbacks=None):
     lib = find_library(libname)
     if lib is not None:
-        return CDLL(lib)
-    else:
-        if fallbacks is not None:
-            for name in fallbacks:
-                try:
-                    return CDLL(name)
-                except OSError:
-                    # move on to the next fallback
-                    pass
-        # the end
-        raise OSError(
-            "Could not find library %s or load any of its variants %s" % (
-                libname, fallbacks or []))
+        try:
+            return CDLL(lib)
+        except OSError:
+            pass
+    if fallbacks is not None:
+        for name in fallbacks:
+            try:
+                return CDLL(name)
+            except OSError:
+                # move on to the next fallback
+                pass
+    # No shared library was loaded. Raise OSError.
+    raise OSError(
+        "Could not find library %s or load any of its variants %s" % (
+            libname, fallbacks or []))
+
 
 if sys.platform.startswith('linux'):
     _lgeos = load_dll('geos_c', fallbacks=['libgeos_c.so.1', 'libgeos_c.so'])
@@ -723,7 +726,7 @@ else:
 
 lgeos = L(_lgeos)
 
+def cleanup(proxy):
+    del proxy
 
-@atexit.register
-def cleanup():
-    lgeos.__del__()
+atexit.register(cleanup, lgeos)