shapely 1.0a7__tar.gz → 1.0b2__tar.gz

{Shapely-1.0a7 → Shapely-1.0b2}/CREDITS.txt

@@ -2,4 +2,5 @@ Sean Gillies (PCL)
 Howard Butler (PCL)
 Kai Lautaportti (PCL)
 Frédéric Junod (Camptocamp SA)
+Eric Lemoine (Camptocamp SA)
 Justin Bronn (GeoDjango) for ctypes inspiration

Shapely-1.0b2/LICENSE.txt

@@ -0,0 +1,28 @@
+
+Copyright (c) 2007, Sean C. Gillies
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of Sean C. Gillies nor the names of
+      its contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+

{Shapely-1.0a7 → Shapely-1.0b2}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 1.0
 Name: Shapely
-Version: 1.0a7
+Version: 1.0b2
 Summary: Geospatial geometries, predicates, and operations
-Home-page: http://trac.gispython.org/projects/PCL/wiki/ShapeLy
+Home-page: http://trac.gispython.org/projects/PCL/wiki/Shapely
 Author: Sean Gillies
 Author-email: sgillies@frii.com
-License: LGPL
+License: BSD
 Description: Shapely
         =======
         
@@ -20,9 +20,6 @@ Description: Shapely
         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/.)
         
-        .. _wiki: http://trac.gispython.org/projects/PCL/wiki/Shapely
-        .. _manual: http://trac.gispython.org/projects/PCL/wiki/ShapelyManual
-        
         Dependencies
         ------------
         
@@ -121,13 +118,25 @@ Description: Shapely
         There are also two test runners under tests/. test_doctests.py requires
         zope.testing. runalldoctests.py does not.
         
+        Support
+        -------
+        
+        For current information about this project, see the wiki_.
+        
+        .. _wiki: http://trac.gispython.org/projects/PCL/wiki/Shapely
+        .. _manual: http://trac.gispython.org/projects/PCL/wiki/ShapelyManual
+        
+        If you have questions, please consider joining our community list:
+        
+        http://trac.gispython.org/projects/PCL/wiki/CommunityList
+        
         
 Keywords: geometry topology
 Platform: UNKNOWN
-Classifier: Development Status :: 3 - Alpha
+Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Science/Research
-Classifier: License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)
+Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Topic :: Scientific/Engineering :: GIS

{Shapely-1.0a7 → Shapely-1.0b2}/README.txt

@@ -12,9 +12,6 @@ applications. For more information, see:
 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/.)
 
-.. _wiki: http://trac.gispython.org/projects/PCL/wiki/Shapely
-.. _manual: http://trac.gispython.org/projects/PCL/wiki/ShapelyManual
-
 Dependencies
 ------------
 
@@ -113,3 +110,15 @@ Several of the modules have docstring doctests::
 There are also two test runners under tests/. test_doctests.py requires
 zope.testing. runalldoctests.py does not.
 
+Support
+-------
+
+For current information about this project, see the wiki_.
+
+.. _wiki: http://trac.gispython.org/projects/PCL/wiki/Shapely
+.. _manual: http://trac.gispython.org/projects/PCL/wiki/ShapelyManual
+
+If you have questions, please consider joining our community list:
+
+http://trac.gispython.org/projects/PCL/wiki/CommunityList
+

{Shapely-1.0a7 → Shapely-1.0b2}/Shapely.egg-info/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 1.0
 Name: Shapely
-Version: 1.0a7
+Version: 1.0b2
 Summary: Geospatial geometries, predicates, and operations
-Home-page: http://trac.gispython.org/projects/PCL/wiki/ShapeLy
+Home-page: http://trac.gispython.org/projects/PCL/wiki/Shapely
 Author: Sean Gillies
 Author-email: sgillies@frii.com
-License: LGPL
+License: BSD
 Description: Shapely
         =======
         
@@ -20,9 +20,6 @@ Description: Shapely
         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/.)
         
-        .. _wiki: http://trac.gispython.org/projects/PCL/wiki/Shapely
-        .. _manual: http://trac.gispython.org/projects/PCL/wiki/ShapelyManual
-        
         Dependencies
         ------------
         
@@ -121,13 +118,25 @@ Description: Shapely
         There are also two test runners under tests/. test_doctests.py requires
         zope.testing. runalldoctests.py does not.
         
+        Support
+        -------
+        
+        For current information about this project, see the wiki_.
+        
+        .. _wiki: http://trac.gispython.org/projects/PCL/wiki/Shapely
+        .. _manual: http://trac.gispython.org/projects/PCL/wiki/ShapelyManual
+        
+        If you have questions, please consider joining our community list:
+        
+        http://trac.gispython.org/projects/PCL/wiki/CommunityList
+        
         
 Keywords: geometry topology
 Platform: UNKNOWN
-Classifier: Development Status :: 3 - Alpha
+Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Science/Research
-Classifier: License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)
+Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Topic :: Scientific/Engineering :: GIS

{Shapely-1.0a7 → Shapely-1.0b2}/Shapely.egg-info/SOURCES.txt

@@ -1,4 +1,7 @@
+CHANGES.txt
 CREDITS.txt
+HISTORY.txt
+LICENSE.txt
 README.txt
 setup.py
 Shapely.egg-info/PKG-INFO
@@ -39,7 +42,8 @@ tests/Point.txt
 tests/Polygon.txt
 tests/Predicates.txt
 tests/__init__.py
-tests/runalldoctests.py
+tests/binascii_hex.txt
+tests/invalid_intersection.txt
 tests/rungrind.dist
-tests/runtests.dist
 tests/test_doctests.py
+tests/valgrind-python.supp

{Shapely-1.0a7 → Shapely-1.0b2}/setup.py

@@ -5,24 +5,25 @@ from setuptools import setup, Extension
 readme_text = file('README.txt', 'rb').read()
 
 setup(name          = 'Shapely',
-      version       = '1.0a7',
+      version       = '1.0b2',
       description   = 'Geospatial geometries, predicates, and operations',
-      license       = 'LGPL',
+      license       = 'BSD',
       keywords      = 'geometry topology',
       author        = 'Sean Gillies',
       author_email  = 'sgillies@frii.com',
       maintainer    = 'Sean Gillies',
       maintainer_email  = 'sgillies@frii.com',
-      url   = 'http://trac.gispython.org/projects/PCL/wiki/ShapeLy',
+      url   = 'http://trac.gispython.org/projects/PCL/wiki/Shapely',
       long_description = readme_text,
       packages      = ['shapely', 'shapely.geometry'],
       install_requires = ['setuptools', 'ctypes'],
-      tests_require = ['zope.testing', 'numpy'],
+      #tests_require = ['numpy'], -- not working with "tests" command
+      test_suite = 'tests.test_suite',
       classifiers   = [
-        'Development Status :: 3 - Alpha',
+        'Development Status :: 4 - Beta',
         'Intended Audience :: Developers',
         'Intended Audience :: Science/Research',
-        'License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)',
+        'License :: OSI Approved :: BSD License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
         'Topic :: Scientific/Engineering :: GIS',

{Shapely-1.0a7 → Shapely-1.0b2}/shapely/geometry/base.py

@@ -3,17 +3,34 @@ Base geometry class and utilities.
 """
 
 from ctypes import string_at, byref, c_int, c_size_t, c_char_p, c_double
+import sys
 
 from shapely.geos import lgeos
 from shapely.predicates import BinaryPredicate, UnaryPredicate
 from shapely.topology import BinaryTopologicalOp, UnaryTopologicalOp
 
 
+GEOMETRY_TYPES = [
+    'Point',
+	'LineString',
+	'LinearRing',
+	'Polygon',
+	'MultiPoint',
+	'MultiLineString',
+	'MultiPolygon',
+	'GeometryCollection'
+    ]
+
+def geometry_type_name(g):
+    return GEOMETRY_TYPES[lgeos.GEOSGeomTypeId(g)]
+
 # Abstract geometry factory for use with topological methods below
 
 def geom_factory(g):
+    if not g:
+        raise ValueError, "No Shapely geometry can be created from this null value"
     ob = BaseGeometry()
-    geom_type = string_at(lgeos.GEOSGeomType(g))
+    geom_type = geometry_type_name(g)
     # TODO: check cost of dynamic import by profiling
     mod = __import__(
         'shapely.geometry', 
@@ -186,6 +203,20 @@ class BaseGeometry(object):
         To be overridden by extension classes."""
         raise NotImplementedError
 
+    @property
+    def array_interface_base(self):
+        if sys.byteorder == 'little':
+            typestr = '<f8'
+        elif sys.byteorder == 'big':
+            typestr = '>f8'
+        else:
+            raise ValueError, "Unsupported byteorder: neither little nor big-endian"
+        return {
+            'version': 3,
+            'typestr': typestr,
+            'data': self.ctypes,
+            }
+
     @property
     def __array_interface__(self):
         """Provide the Numpy array protocol."""
@@ -214,7 +245,7 @@ class BaseGeometry(object):
 
     def geometryType(self):
         """Returns a string representing the geometry type, e.g. 'Polygon'."""
-        return string_at(lgeos.GEOSGeomType(self._geom))
+        return geometry_type_name(self._geom)
 
     def to_wkb(self):
         """Returns a WKB byte string representation of the geometry."""

{Shapely-1.0a7 → Shapely-1.0b2}/shapely/geometry/linestring.py

@@ -154,15 +154,12 @@ class LineString(BaseGeometry):
             self._ctypes_data = data
         return self._ctypes_data
 
-    @property
-    def __array_interface__(self):
+    def array_interface(self):
         """Provide the Numpy array protocol."""
-        return {
-            'version': 3,
-            'shape': (len(self.coords), self._ndim),
-            'typestr': '<f8',
-            'data': self.ctypes,
-            }
+        ai = self.array_interface_base
+        ai.update({'shape': (len(self.coords), self._ndim)})
+        return ai
+    __array_interface__ = property(array_interface)
 
     # Coordinate access
 
@@ -210,12 +207,7 @@ class LineStringAdapter(LineString):
         try:
             return self.context.__array_interface__
         except AttributeError:
-            return {
-                'version': 3,
-                'shape': (self._ndim,),
-                'typestr': '<f8',
-                'data': self.ctypes,
-                }
+            return self.array_interface()
 
     coords = property(BaseGeometry.get_coords)
 

{Shapely-1.0a7 → Shapely-1.0b2}/shapely/geometry/multipoint.py

@@ -108,15 +108,12 @@ class MultiPoint(BaseGeometry):
             self._ctypes_data = data
         return self._ctypes_data
 
-    @property
-    def __array_interface__(self):
+    def array_interface(self):
         """Provide the Numpy array protocol."""
-        return {
-            'version': 3,
-            'shape': (len(self.geoms), self._ndim),
-            'typestr': '<f8',
-            'data': self.ctypes,
-            }
+        ai = self.array_interface_base
+        ai.update({'shape': (len(self.geoms), self._ndim)})
+        return ai
+    __array_interface__ = property(array_interface)
 
     @property
     def coords(self):
@@ -166,12 +163,7 @@ class MultiPointAdapter(MultiPoint):
         try:
             return self.context.__array_interface__
         except AttributeError:
-            return {
-                'version': 3,
-                'shape': (self._ndim,),
-                'typestr': '<f8',
-                'data': self.ctypes,
-                }
+            return self.array_interface()
 
 
 def asMultiPoint(context):

{Shapely-1.0a7 → Shapely-1.0b2}/shapely/geometry/point.py

@@ -159,15 +159,12 @@ class Point(BaseGeometry):
             self._ctypes_data = array
         return self._ctypes_data
 
-    @property
-    def __array_interface__(self):
+    def array_interface(self):
         """Provide the Numpy array protocol."""
-        return {
-            'version': 3,
-            'shape': (self._ndim,),
-            'typestr': '<f8',
-            'data': self.ctypes,
-            }
+        ai = self.array_interface_base
+        ai.update({'shape': (self._ndim,)})
+        return ai
+    __array_interface__ = property(array_interface)
 
     @property
     def bounds(self):
@@ -225,15 +222,11 @@ class PointAdapter(Point):
         try:
             return self.context.__array_interface__
         except AttributeError:
-            return {
-                'version': 3,
-                'shape': (self._ndim,),
-                'typestr': '<f8',
-                'data': self.ctypes,
-                }
+            return self.array_interface()
 
     coords = property(BaseGeometry.get_coords)
 
+
 def asPoint(context):
     """Factory for PointAdapter instances."""
     return PointAdapter(context)

{Shapely-1.0a7 → Shapely-1.0b2}/shapely/topology.py

@@ -26,7 +26,17 @@ class BinaryTopologicalOp(object):
         return self
 
     def __call__(self, other):
-        return self.factory(self.fn(self.context._geom, other._geom))
+        product = self.fn(self.context._geom, other._geom)
+        if not product:
+            # Check validity of geometries
+            if not self.context.is_valid:
+                raise TopologicalError, \
+                "The operation '%s' produced a null geometry. Likely cause is invalidity of the geometry %s" % (self.fn.__name__, repr(self.context))
+            elif not other.is_valid:
+                raise TopologicalError, \
+                "The operation '%s' produced a null geometry. Likely cause is invalidity of the 'other' geometry %s" % (self.fn.__name__, repr(other))
+
+        return self.factory(product)
 
 
 class UnaryTopologicalOp(object):

{Shapely-1.0a7 → Shapely-1.0b2}/tests/Persist.txt

@@ -17,8 +17,6 @@ WKB
 
   >>> from shapely import wkb
   >>> bytes = wkb.dumps(p)
-  >>> bytes.encode("hex")
-  '010100000000000000000000000000000000000000'
   >>> pb = wkb.loads(bytes)
   >>> pb.equals(p)
   True

{Shapely-1.0a7 → Shapely-1.0b2}/tests/Point.txt

@@ -74,7 +74,6 @@ Modify coordinates
   >>> p.__geo_interface__
   {'type': 'Point', 'coordinates': (0.0, 0.0)}
 
-
 Adapter
 -------
 
@@ -117,6 +116,7 @@ Adapter
 
   Now, the inverse
   
+  >>> ai = pa.__array_interface__
   >>> as = asarray(pa)
   >>> as
   array([ 1.,  4.])

Shapely-1.0b2/tests/__init__.py

@@ -0,0 +1,2 @@
+# package
+from test_doctests import test_suite

Shapely-1.0b2/tests/binascii_hex.txt

@@ -0,0 +1,47 @@
+Round-tripping geometries through hex-encoded binary
+====================================================
+
+Hex-encoded binary is the PostGIS geometry representation, and so this is a
+test of the ability to store Shapely geometries in PostGIS.
+
+Point
+-----
+
+  >>> from shapely.geometry import Point
+  >>> point = Point(0.0, 0.0)
+  >>> import binascii
+  >>> x = binascii.b2a_hex(point.wkb)
+  >>> from shapely import wkb
+  >>> shape = wkb.loads(binascii.a2b_hex(x))
+  >>> shape # doctest: +ELLIPSIS
+  <shapely.geometry.point.Point object at ...>
+
+LineString
+----------
+
+  >>> from shapely.geometry import LineString
+  >>> line = LineString(((0.0, 0.0), (1.0, 1.0)))
+  >>> x = binascii.b2a_hex(line.wkb)
+  >>> shape = wkb.loads(binascii.a2b_hex(x))
+  >>> shape # doctest: +ELLIPSIS
+  <shapely.geometry.linestring.LineString object at ...>
+
+Polygon
+----------
+
+  >>> from shapely.geometry import Polygon
+  >>> polygon = Polygon(((0.0, 0.0), (0.0, 1.0), (1.0, 1.0), (1.0, 0.0)))
+  >>> x = binascii.b2a_hex(polygon.wkb)
+  >>> shape = wkb.loads(binascii.a2b_hex(x))
+  >>> shape # doctest: +ELLIPSIS
+  <shapely.geometry.polygon.Polygon object at ...>
+
+Polygon with hole
+-----------------
+
+  >>> polygon = Polygon(((0.0, 0.0), (0.0, 1.0), (1.0, 1.0), (1.0, 0.0)), [((0.1,0.1), (0.1,0.2), (0.2,0.2), (0.2,0.1))])
+  >>> x = binascii.b2a_hex(polygon.wkb)
+  >>> shape = wkb.loads(binascii.a2b_hex(x))
+  >>> shape # doctest: +ELLIPSIS
+  <shapely.geometry.polygon.Polygon object at ...>
+

Shapely-1.0b2/tests/invalid_intersection.txt

@@ -0,0 +1,29 @@
+Test recovery from operation on invalid geometries
+==================================================
+
+  Make a self-intersecting polygon
+
+  >>> from shapely.geometry import Polygon
+  >>> polygon_invalid = Polygon(((0, 0), (1, 1), (1, -1), (0, 1), (0, 0)))
+  >>> polygon_invalid.is_valid
+  False
+
+  Intersect with a valid polygon
+
+  >>> polygon = Polygon(((-.5, -.5), (-.5, .5), (.5, .5), (.5, -5)))
+  >>> polygon.is_valid
+  True
+  >>> polygon_invalid.intersects(polygon)
+  True
+  >>> result = polygon_invalid.intersection(polygon) # doctest: +ELLIPSIS
+  Traceback (most recent call last):
+  ...
+  TopologicalError: The operation 'GEOSIntersection' produced a null geometry. Likely cause is invalidity of the geometry <shapely.geometry.polygon.Polygon object at ...>
+
+  Check exception symmetry
+
+  >>> result = polygon.intersection(polygon_invalid) # doctest: +ELLIPSIS
+  Traceback (most recent call last):
+  ...
+  TopologicalError: The operation 'GEOSIntersection' produced a null geometry. Likely cause is invalidity of the 'other' geometry <shapely.geometry.polygon.Polygon object at ...>
+

Shapely-1.0b2/tests/rungrind.dist

@@ -0,0 +1,4 @@
+#!/bin/sh
+#export PYTHONPATH=YOUR_CUSTOM_PATH
+valgrind --tool=memcheck --leak-check=yes --suppressions=valgrind-python.supp python test_doctests.py
+

{Shapely-1.0a7 → Shapely-1.0b2}/tests/test_doctests.py

@@ -1,9 +1,8 @@
+import doctest
 import unittest
 import glob
 import os
 
-from zope.testing import doctest
-
 optionflags = (doctest.REPORT_ONLY_FIRST_FAILURE |
                doctest.NORMALIZE_WHITESPACE |
                doctest.ELLIPSIS)
@@ -29,3 +28,7 @@ def test_suite():
                               setUp=setUp)
          for filename
          in list_doctests()])
+
+if __name__ == "__main__":
+    runner = unittest.TextTestRunner()
+    runner.run(test_suite())

Shapely-1.0b2/tests/valgrind-python.supp

@@ -0,0 +1,240 @@
+#
+# This is a valgrind suppression file that should be used when using valgrind.
+#
+#  Here's an example of running valgrind:
+#
+#	cd python/dist/src
+#	valgrind --tool=memcheck --suppressions=Misc/valgrind-python.supp \
+#		./python -E -tt ./Lib/test/regrtest.py -u bsddb,network
+#
+# You must edit Objects/obmalloc.c and uncomment Py_USING_MEMORY_DEBUGGER
+# to use the preferred suppressions with Py_ADDRESS_IN_RANGE.
+#
+# If you do not want to recompile Python, you can uncomment
+# suppressions for PyObject_Free and PyObject_Realloc.
+#
+# See Misc/README.valgrind for more information.
+
+# all tool names: Addrcheck,Memcheck,cachegrind,helgrind,massif
+{
+   ADDRESS_IN_RANGE/Invalid read of size 4
+   Memcheck:Addr4
+   fun:Py_ADDRESS_IN_RANGE
+}
+
+{
+   ADDRESS_IN_RANGE/Invalid read of size 4
+   Memcheck:Value4
+   fun:Py_ADDRESS_IN_RANGE
+}
+
+{
+   ADDRESS_IN_RANGE/Conditional jump or move depends on uninitialised value
+   Memcheck:Cond
+   fun:Py_ADDRESS_IN_RANGE
+}
+
+{
+   ADDRESS_IN_RANGE/Invalid read of size 4
+   Memcheck:Addr4
+   fun:PyObject_Free
+}
+
+{
+   ADDRESS_IN_RANGE/Invalid read of size 4
+   Memcheck:Value4
+   fun:PyObject_Free
+}
+
+{
+   ADDRESS_IN_RANGE/Conditional jump or move depends on uninitialised value
+   Memcheck:Cond
+   fun:PyObject_Free
+}
+
+{
+   ADDRESS_IN_RANGE/Invalid read of size 4
+   Memcheck:Addr4
+   fun:PyObject_Realloc
+}
+
+{
+   ADDRESS_IN_RANGE/Invalid read of size 4
+   Memcheck:Value4
+   fun:PyObject_Realloc
+}
+
+{
+  ADDRESS_IN_RANGE/Conditional jump or move depends on uninitialised value
+  Memcheck:Cond
+  fun:PyObject_Realloc
+}
+
+###
+### All the suppressions below are for errors that occur within libraries
+### that Python uses.  The problems to not appear to be related to Python's
+### use of the libraries.
+###
+{
+   GDBM problems, see test_gdbm
+   Memcheck:Param
+   write(buf)
+   fun:write
+   fun:gdbm_open
+
+}
+
+###
+### These occur from somewhere within the SSL, when running
+###  test_socket_sll.  They are too general to leave on by default.
+###
+###{
+###   somewhere in SSL stuff
+###   Memcheck:Cond
+###   fun:memset
+###}
+###{
+###   somewhere in SSL stuff
+###   Memcheck:Value4
+###   fun:memset
+###}
+###
+###{
+###   somewhere in SSL stuff
+###   Memcheck:Cond
+###   fun:MD5_Update
+###}
+###
+###{
+###   somewhere in SSL stuff
+###   Memcheck:Value4
+###   fun:MD5_Update
+###}
+
+#
+# All of these problems come from using test_socket_ssl
+#
+{
+   from test_socket_ssl
+   Memcheck:Cond
+   fun:BN_bin2bn
+}
+
+{
+   from test_socket_ssl
+   Memcheck:Cond
+   fun:BN_num_bits_word
+}
+
+{
+   from test_socket_ssl
+   Memcheck:Value4
+   fun:BN_num_bits_word
+}
+
+{
+   from test_socket_ssl
+   Memcheck:Cond
+   fun:BN_mod_exp_mont_word
+}
+
+{
+   from test_socket_ssl
+   Memcheck:Cond
+   fun:BN_mod_exp_mont
+}
+
+{
+   from test_socket_ssl
+   Memcheck:Param
+   write(buf)
+   fun:write
+   obj:/usr/lib/libcrypto.so.0.9.7
+}
+
+{
+   from test_socket_ssl
+   Memcheck:Cond
+   fun:RSA_verify
+}
+
+{
+   from test_socket_ssl
+   Memcheck:Value4
+   fun:RSA_verify
+}
+
+{
+   from test_socket_ssl
+   Memcheck:Value4
+   fun:DES_set_key_unchecked
+}
+
+{
+   from test_socket_ssl
+   Memcheck:Value4
+   fun:DES_encrypt2
+}
+
+{
+   from test_socket_ssl
+   Memcheck:Cond
+   obj:/usr/lib/libssl.so.0.9.7
+}
+
+{
+   from test_socket_ssl
+   Memcheck:Value4
+   obj:/usr/lib/libssl.so.0.9.7
+}
+
+{
+   from test_socket_ssl
+   Memcheck:Cond
+   fun:BUF_MEM_grow_clean
+}
+
+{
+   from test_socket_ssl
+   Memcheck:Cond
+   fun:memcpy
+   fun:ssl3_read_bytes
+}
+
+{
+   from test_socket_ssl
+   Memcheck:Cond
+   fun:SHA1_Update
+}
+
+{
+   from test_socket_ssl
+   Memcheck:Value4
+   fun:SHA1_Update
+}
+
+
+# some extra lxml specific (?) suppressions..
+
+{
+   Test
+   Memcheck:Param
+   sigaction(act)
+   fun:__libc_sigaction
+}
+
+{
+   ld
+   Memcheck:Cond
+   obj:/lib/ld-2.6.so
+   obj:/lib/ld-2.6.so
+   obj:*
+}
+
+{
+   ld
+   Memcheck:Addr4
+   obj:/lib/ld-2.6.so
+   obj:/lib/ld-2.6.so
+   obj:*
+}

Shapely-1.0a7/tests/__init__.py

@@ -1 +0,0 @@
-# package

Shapely-1.0a7/tests/runalldoctests.py

@@ -1,49 +0,0 @@
-
-try:
-    import pkg_resources
-    pkg_resources.require('Shapely')
-except:
-    pass
-
-if __name__ == '__main__':
-    import doctest
-    import getopt
-    import glob
-    import sys
-    
-    verbosity = 0
-    pattern = None
-
-    try:
-        opts, args = getopt.getopt(sys.argv[1:], 'vt:')
-        for o, a in opts:
-            if o == '-v':
-                verbosity = verbosity + 1
-            if o == '-t':
-                pattern = a
-    except:
-        pass
-
-    docfiles = [
-        'Array.txt',
-        'GeoInterface.txt',
-        'IterOps.txt',
-        'LineString.txt',
-        'MultiLineString.txt',
-        'MultiPoint.txt',
-        'MultiPolygon.txt',
-        'Operations.txt',
-        'Persist.txt',
-        'Point.txt',
-        'Polygon.txt',
-        'Predicates.txt'
-        ]
-        
-    if pattern:
-        tests = [f for f in docfiles if f.find(pattern) == 0]
-    else:
-        tests = docfiles
-        
-    for file in tests:
-        doctest.testfile(file, verbose=verbosity)
-

Shapely-1.0a7/tests/rungrind.dist

@@ -1,4 +0,0 @@
-#!/bin/sh
-#export PYTHONPATH=YOUR_CUSTOM_PATH
-valgrind --tool=memcheck --leak-check=yes --suppressions=/home/sean/Projects/valgrind-python.supp python runalltests.py
-

Shapely-1.0a7/tests/runtests.dist

@@ -1,4 +0,0 @@
-#!/bin/sh
-#export PYTHONPATH=YOUR_CUSTOM_PATH
-python runalltests.py
-