shapely 1.0.13__tar.gz → 1.0.14__tar.gz

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

@@ -1,5 +1,10 @@
 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

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

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

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

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

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

@@ -6,6 +6,7 @@ LICENSE.txt
 MANIFEST.in
 README.txt
 setup.py
+setup_windows.py
 Shapely.egg-info/PKG-INFO
 Shapely.egg-info/SOURCES.txt
 Shapely.egg-info/dependency_links.txt
@@ -14,6 +15,7 @@ Shapely.egg-info/top_level.txt
 examples/geoms.py
 examples/world.py
 manual/manual.txt
+manual/style.css
 shapely/__init__.py
 shapely/ctypes_declarations.py
 shapely/geos.py
@@ -46,9 +48,14 @@ tests/Persist.txt
 tests/Point.txt
 tests/Polygon.txt
 tests/Predicates.txt
+tests/__init__.py
 tests/attribute-chains.txt
 tests/binascii_hex.txt
 tests/dimensions.txt
 tests/invalid_intersection.txt
 tests/polygonize.txt
+tests/rungrind.dist
+tests/test_doctests.py
+tests/test_threads.py
+tests/valgrind-python.supp
 tests/wkt_locale.txt

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

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

Shapely-1.0.14/manual/style.css

@@ -0,0 +1,231 @@
+/* css */
+
+body {
+  font: 90% 'Lucida Grande', Verdana, Geneva, Lucida, Arial, Helvetica, sans-serif;
+  background: #ffffff;
+  color: black;
+  margin: 2em;
+  padding: 2em;
+}
+
+a[href] {
+  color: #436976;
+  background-color: transparent;
+}
+
+a.toc-backref {
+  text-decoration: none;
+}
+
+h1 a[href] {
+  text-decoration: none;
+  color: #fcb100;
+  background-color: transparent;
+}
+
+a.strong {
+  font-weight: bold;
+}
+
+img {
+  margin: 0;
+  border: 0;
+}
+
+p {
+  margin: 0.5em 0 1em 0;
+  line-height: 1.5em;
+}
+p a {
+  text-decoration: underline;
+}
+p a:visited {
+  color: purple;
+  background-color: transparent;
+}
+p a:active {
+  color: red;
+  background-color: transparent;
+}
+a:hover {
+  text-decoration: none;
+}
+p img {
+  border: 0;
+  margin: 0;
+}
+
+h1, h2, h3, h4, h5, h6 {
+  color: #003a6b;
+  background-color: transparent;
+  font: 100% 'Lucida Grande', Verdana, Geneva, Lucida, Arial, Helvetica, sans-serif;
+  margin: 0;
+  padding-top: 0.5em;
+}
+
+h1 {
+  font-size: 160%;
+  margin-bottom: 0.5em;
+  border-bottom: 1px solid #fcb100;
+}
+h2 {
+  font-size: 140%;
+  margin-bottom: 0.5em;
+  border-bottom: 1px solid #aaa;
+}
+h3 {
+  font-size: 130%;
+  margin-bottom: 0.5em;
+  text-decoration: underline;
+}
+h4 {
+  font-size: 110%;
+  font-weight: bold;
+}
+h5 {
+  font-size: 100%;
+  font-weight: bold;
+}
+h6 {
+  font-size: 80%;
+  font-weight: bold;
+}
+
+ul a, ol a {
+  text-decoration: underline;
+}
+
+dt {
+  font-weight: bold;
+}
+dt a {
+  text-decoration: none;
+}
+
+dd {
+  line-height: 1.5em;
+  margin-bottom: 1em;
+}
+
+legend {
+  background: #ffffff;
+  padding: 0.5em;
+}
+
+form {
+  margin: 0;
+}
+
+
+dl.form {
+  margin: 0;
+  padding: 1em;
+}
+
+dl.form dt {
+  width: 30%;
+  float: left;
+  margin: 0;
+  padding: 0 0.5em 0.5em 0;
+  text-align: right;
+}
+
+input {
+  font: 100% 'Lucida Grande', Verdana, Geneva, Lucida, Arial, Helvetica, sans-serif;
+  color: black;
+  background-color: white;
+  vertical-align: middle;
+}
+
+abbr, acronym, .explain {
+  color: black;
+  background-color: transparent;
+}
+
+q, blockquote {
+}
+
+code, pre {
+  font-family: monospace;
+  font-size: 1.2em;
+  display: block;
+  padding: 10px;
+  border: 1px solid #838183;
+  background-color: #eee;
+  color: #000;
+  overflow: auto;
+  margin: 0.5em 1em;
+}
+
+tt.docutils {
+  background-color: #eeeeee;
+}
+
+.docinfo {
+  text-align: left;
+}
+
+div.highlight {
+  margin-left: 2em ;
+  margin-right: 2em ;
+  background-color: #eeeeee
+  }
+
+.c { color: #008800; font-style: italic } /* Comment */
+.err { border: 1px solid #FF0000 } /* Error */
+.k { color: #AA22FF; font-weight: bold } /* Keyword */
+.o { color: #666666 } /* Operator */
+.cm { color: #008800; font-style: italic } /* Comment.Multiline */
+.cp { color: #008800 } /* Comment.Preproc */
+.c1 { color: #008800; font-style: italic } /* Comment.Single */
+.gd { color: #A00000 } /* Generic.Deleted */
+.ge { font-style: italic } /* Generic.Emph */
+.gr { color: #FF0000 } /* Generic.Error */
+.gh { color: #000080; font-weight: bold } /* Generic.Heading */
+.gi { color: #00A000 } /* Generic.Inserted */
+.go { color: #808080 } /* Generic.Output */
+.gp { color: #000080; font-weight: bold } /* Generic.Prompt */
+.gs { font-weight: bold } /* Generic.Strong */
+.gu { color: #800080; font-weight: bold } /* Generic.Subheading */
+.gt { color: #0040D0 } /* Generic.Traceback */
+.kc { color: #AA22FF; font-weight: bold } /* Keyword.Constant */
+.kd { color: #AA22FF; font-weight: bold } /* Keyword.Declaration */
+.kp { color: #AA22FF } /* Keyword.Pseudo */
+.kr { color: #AA22FF; font-weight: bold } /* Keyword.Reserved */
+.kt { color: #AA22FF; font-weight: bold } /* Keyword.Type */
+.m { color: #666666 } /* Literal.Number */
+.s { color: #BB4444 } /* Literal.String */
+.na { color: #BB4444 } /* Name.Attribute */
+.nb { color: #AA22FF } /* Name.Builtin */
+.nc { color: #0000FF } /* Name.Class */
+.no { color: #880000 } /* Name.Constant */
+.nd { color: #AA22FF } /* Name.Decorator */
+.ni { color: #999999; font-weight: bold } /* Name.Entity */
+.ne { color: #D2413A; font-weight: bold } /* Name.Exception */
+.nf { color: #00A000 } /* Name.Function */
+.nl { color: #A0A000 } /* Name.Label */
+.nn { color: #0000FF; font-weight: bold } /* Name.Namespace */
+.nt { color: #008000; font-weight: bold } /* Name.Tag */
+.nv { color: #B8860B } /* Name.Variable */
+.ow { color: #AA22FF; font-weight: bold } /* Operator.Word */
+.mf { color: #666666 } /* Literal.Number.Float */
+.mh { color: #666666 } /* Literal.Number.Hex */
+.mi { color: #666666 } /* Literal.Number.Integer */
+.mo { color: #666666 } /* Literal.Number.Oct */
+.sb { color: #BB4444 } /* Literal.String.Backtick */
+.sc { color: #BB4444 } /* Literal.String.Char */
+.sd { color: #BB4444; font-style: italic } /* Literal.String.Doc */
+.s2 { color: #BB4444 } /* Literal.String.Double */
+.se { color: #BB6622; font-weight: bold } /* Literal.String.Escape */
+.sh { color: #BB4444 } /* Literal.String.Heredoc */
+.si { color: #BB6688; font-weight: bold } /* Literal.String.Interpol */
+.sx { color: #008000 } /* Literal.String.Other */
+.sr { color: #BB6688 } /* Literal.String.Regex */
+.s1 { color: #BB4444 } /* Literal.String.Single */
+.ss { color: #B8860B } /* Literal.String.Symbol */
+.bp { color: #AA22FF } /* Name.Builtin.Pseudo */
+.vc { color: #B8860B } /* Name.Variable.Class */
+.vg { color: #B8860B } /* Name.Variable.Global */
+.vi { color: #B8860B } /* Name.Variable.Instance */
+.il { color: #666666 } /* Literal.Number.Integer.Long */
+

{Shapely-1.0.13 → 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.13',
+      version       = '1.0.14',
       description   = 'Geospatial geometries, predicates, and operations',
       license       = 'BSD',
       keywords      = 'geometry topology',

Shapely-1.0.14/setup_windows.py

@@ -0,0 +1,37 @@
+from setuptools import setup, Extension
+from sys import version_info
+
+# Require ctypes egg only for Python < 2.5
+install_requires = ['setuptools']
+if version_info[:2] < (2,5):
+    install_requires.append('ctypes')
+
+# Get text from README.txt
+readme_text = file('README.txt', 'rb').read()
+
+setup(name          = 'Shapely',
+      version       = '1.0.14',
+      description   = 'Geospatial geometries, predicates, and operations',
+      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/lab/wiki/Shapely',
+      long_description = readme_text,
+      packages      = ['shapely', 'shapely.geometry'],
+      data_files=[('DLLs', ['DLLs/geos.dll', 'DLLs/libgeos-3-0-0.dll']),],
+      install_requires = install_requires,
+      #tests_require = ['numpy'], -- not working with "tests" command
+      test_suite = 'tests.test_suite',
+      classifiers   = [
+        'Development Status :: 5 - Production/Stable',
+        'Intended Audience :: Developers',
+        'Intended Audience :: Science/Research',
+        'License :: OSI Approved :: BSD License',
+        'Operating System :: OS Independent',
+        'Programming Language :: Python',
+        'Topic :: Scientific/Engineering :: GIS',
+        ],
+)

{Shapely-1.0.13 → Shapely-1.0.14}/shapely/ctypes_declarations.py

@@ -23,6 +23,10 @@ def prototype(lgeos):
     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]
 

{Shapely-1.0.13 → 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.13 → Shapely-1.0.14}/shapely/geos.py

@@ -3,7 +3,7 @@ Exports the libgeos_c shared lib, GEOS-specific exceptions, and utilities.
 """
 
 import atexit
-from ctypes import cdll, CDLL, PyDLL, CFUNCTYPE, c_char_p
+from ctypes import cdll, CDLL, PyDLL, CFUNCTYPE, c_char_p, c_void_p
 from ctypes.util import find_library
 import os
 import sys
@@ -43,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:
@@ -52,6 +54,8 @@ 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

{Shapely-1.0.13 → 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.14/tests/__init__.py

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

Shapely-1.0.14/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.0.14/tests/test_doctests.py

@@ -0,0 +1,35 @@
+import doctest
+import unittest
+import glob
+import os
+
+optionflags = (doctest.REPORT_ONLY_FIRST_FAILURE |
+               doctest.NORMALIZE_WHITESPACE |
+               doctest.ELLIPSIS)
+
+def list_doctests():
+    print __file__
+    return [filename
+            for filename
+            in glob.glob(os.path.join(os.path.dirname(__file__), '*.txt'))]
+
+def open_file(filename, mode='r'):
+    """Helper function to open files from within the tests package."""
+    return open(os.path.join(os.path.dirname(__file__), filename), mode)
+
+def setUp(test):
+    test.globs.update(dict(
+            open_file = open_file,
+            ))
+
+def test_suite():
+    return unittest.TestSuite(
+        [doctest.DocFileSuite(os.path.basename(filename),
+                              optionflags=optionflags,
+                              setUp=setUp)
+         for filename
+         in list_doctests()])
+
+if __name__ == "__main__":
+    runner = unittest.TextTestRunner(verbosity=1)
+    runner.run(test_suite())

Shapely-1.0.14/tests/test_threads.py

@@ -0,0 +1,33 @@
+import threading
+
+def main():
+   num_threads = 4
+   use_threads = True
+   
+   if not use_threads:
+      # Run core code
+      runShapelyBuilding()
+   else:
+      threads = [threading.Thread(target=runShapelyBuilding) for x in range(num_threads)]
+      for t in threads:
+         t.start()
+      for t in threads:
+         t.join()
+         
+def runShapelyBuilding():
+   import shapely.wkt
+   import shapely.wkb
+   
+   print "Running shapely tests on wkb"
+   
+   wkb = shapely.wkt.loads("POINT (0 0)").wkb
+   
+   for i in xrange(1000):
+      obj = shapely.wkb.loads(wkb)
+   
+   print "Done"
+   
+# Run main
+if __name__ == '__main__':
+   main()   
+

Shapely-1.0.14/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.0.13/Shapely.egg-info/requires.txt

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