shapely 1.2b6__tar.gz → 1.2b7__tar.gz

{Shapely-1.2b6 → Shapely-1.2b7}/CHANGES.txt

@@ -1,5 +1,9 @@
 All tickets are children of http://trac.gispython.org/lab/ticket.
 
+1.2b7 (2010-04-22)
+------------------
+- Memory leak associated with new empty geometry state fixed.
+
 1.2b6 (2010-04-13)
 ------------------
 - Broken GeometryCollection fixed.

{Shapely-1.2b6 → Shapely-1.2b7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: Shapely
-Version: 1.2b6
+Version: 1.2b7
 Summary: Planar geometries, predicates, and operations
 Home-page: http://trac.gispython.org/lab/wiki/Shapely
 Author: Sean Gillies

{Shapely-1.2b6 → Shapely-1.2b7}/Shapely.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: Shapely
-Version: 1.2b6
+Version: 1.2b7
 Summary: Planar geometries, predicates, and operations
 Home-page: http://trac.gispython.org/lab/wiki/Shapely
 Author: Sean Gillies

{Shapely-1.2b6 → Shapely-1.2b7}/setup.py

@@ -16,7 +16,7 @@ readme_text = file('README.txt', 'rb').read()
 setup_args = dict(
     metadata_version    = '1.2',
     name                = 'Shapely',
-    version             = '1.2b6',
+    version             = '1.2b7',
     requires_python     = '>=2.5,<3',
     requires_external   = 'libgeos_c (>=3.1)', 
     description         = 'Planar geometries, predicates, and operations',

{Shapely-1.2b6 → Shapely-1.2b7}/shapely/geometry/base.py

@@ -53,6 +53,7 @@ def exceptNull(func):
         return func(*args, **kwargs)
     return wrapper
 
+EMPTY = wkb.deserialize('010700000000000000'.decode('hex'))
 
 class BaseGeometry(object):
     """
@@ -78,7 +79,7 @@ class BaseGeometry(object):
     # _owned : bool
     #     True if this object's GEOS geometry is owned by another as in the case
     #     of a multipart geometry member.
-    __geom__ = None
+    __geom__ = EMPTY
     __p__ = None
     _ctypes_data = None
     _ndim = None
@@ -88,13 +89,18 @@ class BaseGeometry(object):
     # Backend config
     impl = DefaultImplementation
 
-    def __init__(self):
-        self.__geom__ = wkb.deserialize('010700000000000000'.decode('hex'))
+    @property
+    def _is_empty(self):
+        return self.__geom__ in [EMPTY, None]
 
-    def __del__(self):
-        if self.__geom__ is not None and not self._owned:
+    def empty(self):
+        if not (self._owned or self._is_empty):
             from shapely.geos import lgeos
             lgeos.GEOSGeom_destroy(self.__geom__)
+        self.__geom__ = EMPTY
+
+    def __del__(self):
+        self.empty()
         self.__geom__ = None
         self.__p__ = None
 
@@ -106,12 +112,14 @@ class BaseGeometry(object):
         return (self.__class__, (), self.to_wkb())
 
     def __setstate__(self, state):
+        self.empty()
         self.__geom__ = wkb.deserialize(state)
     
     # The _geom property
     def _get_geom(self):
         return self.__geom__
     def _set_geom(self, val):
+        self.empty()
         self.__geom__ = val
     _geom = property(_get_geom, _set_geom)
 
@@ -320,7 +328,7 @@ class BaseGeometry(object):
     @property
     def is_empty(self):
         """True if the set of points in this geometry is empty, else False"""
-        return bool(self.impl['is_empty'](self))
+        return bool(self.impl['is_empty'](self)) or (self._geom is None)
 
     @property
     def is_ring(self):

{Shapely-1.2b6 → Shapely-1.2b7}/shapely/geometry/linestring.py

@@ -37,14 +37,8 @@ class LineString(BaseGeometry):
           2.0
         """
         BaseGeometry.__init__(self)
-        self._init_geom(coordinates)
-
-    def _init_geom(self, coordinates):
-        if coordinates is None:
-            # allow creation of null lines, to support unpickling
-            pass
-        else:
-            self._geom, self._ndim = geos_linestring_from_py(coordinates)
+        if coordinates is not None:
+            self._set_coords(coordinates)
 
     @property
     def __geo_interface__(self):
@@ -66,14 +60,9 @@ class LineString(BaseGeometry):
     __array_interface__ = property(array_interface)
 
     # Coordinate access
-
     def _set_coords(self, coordinates):
-        if self.is_empty:
-            lgeos.GEOSGeom_destroy(self.__geom__)
-            self.__geom__ = None
-        if self._geom is None:
-            self._init_geom(coordinates)
-        update_linestring_from_py(self, coordinates)
+        self.empty()
+        self._geom, self._ndim = geos_linestring_from_py(coordinates)
 
     coords = property(BaseGeometry._get_coords, _set_coords)
 
@@ -94,9 +83,6 @@ class LineString(BaseGeometry):
 
 class LineStringAdapter(CachingGeometryProxy, LineString):
 
-    context = None
-    _owned = False
-
     def __init__(self, context):
         self.context = context
         self.factory = geos_linestring_from_py

{Shapely-1.2b6 → Shapely-1.2b7}/shapely/geometry/point.py

@@ -45,17 +45,8 @@ class Point(BaseGeometry):
             Easting, northing, and elevation.
         """
         BaseGeometry.__init__(self)
-        self._init_geom(*args)
-
-    def _init_geom(self, *args):
-        if len(args) == 0:
-            # allow creation of null points, to support unpickling
-            pass
-        else:
-            if len(args) == 1:
-                self._geom, self._ndim = geos_point_from_py(args[0])
-            else:
-                self._geom, self._ndim = geos_point_from_py(tuple(args))
+        if len(args) > 0:
+            self._set_coords(*args)
 
     # Coordinate getters and setters
 
@@ -110,14 +101,12 @@ class Point(BaseGeometry):
 
     # Coordinate access
 
-    def _set_coords(self, coordinates):
-        if self.is_empty:
-            lgeos.GEOSGeom_destroy(self.__geom__)
-            self.__geom__ = None
-        if self._geom is None:
-            self._init_geom(coordinates)
+    def _set_coords(self, *args):
+        self.empty()
+        if len(args) == 1:
+            self._geom, self._ndim = geos_point_from_py(args[0])
         else:
-            update_point_from_py(self, coordinates)
+            self._geom, self._ndim = geos_point_from_py(tuple(args))
 
     coords = property(BaseGeometry._get_coords, _set_coords)
 

{Shapely-1.2b6 → Shapely-1.2b7}/shapely/geometry/polygon.py

@@ -20,11 +20,6 @@ class LinearRing(LineString):
     invalid and operations on it may fail.
     """
     
-    _ndim = None
-    __geom__ = None
-    __p__ = None
-    _owned = False
-
     def __init__(self, coordinates=None):
         """
         Parameters
@@ -46,14 +41,8 @@ class LinearRing(LineString):
           4.0
         """
         BaseGeometry.__init__(self)
-        self._init_geom(coordinates)
-
-    def _init_geom(self, coordinates):
-        if coordinates is None:
-            # allow creation of null lines, to support unpickling
-            pass
-        else:
-            self._geom, self._ndim = geos_linearring_from_py(coordinates)
+        if coordinates is not None:
+            self._set_coords(coordinates)
 
     @property
     def __geo_interface__(self):
@@ -67,30 +56,19 @@ class LinearRing(LineString):
     _get_coords = BaseGeometry._get_coords
 
     def _set_coords(self, coordinates):
-        if self.is_empty:
-            lgeos.GEOSGeom_destroy(self.__geom__)
-            self.__geom__ = None
-        if self._geom is None:
-            self._init_geom(coordinates)
-        update_linearring_from_py(self, coordinates)
+        self.empty()
+        self._geom, self._ndim = geos_linearring_from_py(coordinates)
 
     coords = property(_get_coords, _set_coords)
 
 
 class LinearRingAdapter(LineStringAdapter):
 
-    context = None
-    __geom__ = None
     __p__ = None
-    _owned = False
 
-    @property
-    def _geom(self):
-        """Keeps the GEOS geometry in synch with the context."""
-        if self.__geom__ is not None:
-            lgeos.GEOSGeom_destroy(self.__geom)
-        self.__geom, n = geos_linearring_from_py(self.context)
-        return self.__geom
+    def __init__(self, context):
+        self.context = context
+        self.factory = geos_linearring_from_py
 
     @property
     def __geo_interface__(self):
@@ -194,8 +172,6 @@ class Polygon(BaseGeometry):
     _exterior = None
     _interiors = []
     _ndim = 2
-    __geom__ = None
-    _owned = False
 
     def __init__(self, shell=None, holes=None):
         """
@@ -276,10 +252,6 @@ class Polygon(BaseGeometry):
 
 class PolygonAdapter(PolygonProxy, Polygon):
     
-    context = None
-    __geom__ = None
-    _owned = False
-
     def __init__(self, shell, holes=None):
         self.shell = shell
         self.holes = holes

{Shapely-1.2b6 → Shapely-1.2b7}/shapely/geometry/proxy.py

@@ -2,27 +2,37 @@
 """
 
 from shapely.geos import lgeos
+from shapely import wkb
+
+EMPTY = wkb.deserialize('010700000000000000'.decode('hex'))
 
 
 class CachingGeometryProxy(object):
 
     context = None
     factory = None
-    __geom__ = None
+    __geom__ = EMPTY
     _gtag = None
 
     def __init__(self, context):
         self.context = context
 
+    @property
+    def _is_empty(self):
+        return self.__geom__ in [EMPTY, None]
+
+    def empty(self):
+        if not self._is_empty:
+            from shapely.geos import lgeos
+            lgeos.GEOSGeom_destroy(self.__geom__)
+        self.__geom__ = EMPTY
+
     @property
     def _geom(self):
         """Keeps the GEOS geometry in synch with the context."""
         gtag = self.gtag()
-        if gtag != self._gtag:
-            if self.__geom__ is not None:
-                lgeos.GEOSGeom_destroy(self.__geom__)
-            self.__geom__, n = self.factory(self.context)
-        elif self.__geom__ is None:
+        if gtag != self._gtag or self._is_empty:
+            self.empty()
             self.__geom__, n = self.factory(self.context)
         self._gtag = gtag
         return self.__geom__
@@ -37,11 +47,8 @@ class PolygonProxy(CachingGeometryProxy):
     def _geom(self):
         """Keeps the GEOS geometry in synch with the context."""
         gtag = self.gtag()
-        if gtag != self._gtag:
-            if self.__geom__ is not None:
-                lgeos.GEOSGeom_destroy(self.__geom__)
-            self.__geom__, n = self.factory(self.context[0], self.context[1])
-        elif self.__geom__ is None:
+        if gtag != self._gtag or self._is_empty:
+            self.empty()
             self.__geom__, n = self.factory(self.context[0], self.context[1])
         self._gtag = gtag
         return self.__geom__

{Shapely-1.2b6 → Shapely-1.2b7}/shapely/geos.py

@@ -136,6 +136,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.finishGEOS_r.argtypes = [c_void_p]
 
 # Exceptions
 
@@ -160,7 +161,7 @@ def notice_handler(fmt, list):
 notice_h = CFUNCTYPE(None, c_char_p, c_char_p)(notice_handler)
 
 def cleanup():
-    if _lgeos is not None:
+    if _lgeos is not None :
         _lgeos.finishGEOS()
 
 atexit.register(cleanup)

{Shapely-1.2b6 → Shapely-1.2b7}/shapely/tests/__init__.py

@@ -1,12 +1,13 @@
 from unittest import TestSuite
 
 import test_doctests, test_prepared, test_equality, test_geomseq, test_xy
-import test_collection
+import test_collection, test_emptiness
 
 def test_suite():
     suite = TestSuite()
     suite.addTest(test_doctests.test_suite())
     suite.addTest(test_prepared.test_suite())
+    suite.addTest(test_emptiness.test_suite())
     suite.addTest(test_equality.test_suite())
     suite.addTest(test_geomseq.test_suite())
     suite.addTest(test_xy.test_suite())