shapely 1.2.10__py2.7-win-amd64.egg → 1.2.13__py2.7-win-amd64.egg

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/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."""