shapely 1.5.1__tar.gz → 1.5.3__tar.gz

{Shapely-1.5.1 → Shapely-1.5.3}/CHANGES.txt

@@ -1,6 +1,16 @@
 Changes
 =======
 
+1.5.3 (2015-01-12)
+------------------
+- Fixed ownership and potential memory leak in polygonize (#223).
+- Wider release of binary wheels for OS X.
+
+1.5.2 (2015-01-04)
+------------------
+- Fail installation if GEOS dependency is not met, preventing update breakage
+  (#218, #219).
+
 1.5.1 (2014-12-04)
 ------------------
 - Restore geometry hashing (#209).

{Shapely-1.5.1/Shapely.egg-info → Shapely-1.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: Shapely
-Version: 1.5.1
+Version: 1.5.3
 Summary: Geometric objects, predicates, and operations
 Home-page: https://github.com/Toblerity/Shapely
 Author: Sean Gillies
@@ -33,10 +33,10 @@ Description: =======
         Requirements
         ============
         
-        Shapely 1.5 requires
+        Shapely 1.5.x requires
         
         * Python >=2.6 (including Python 3.x)
-        * GEOS >=3.3 (Shapely 1.2 requires only GEOS 3.1 but YMMV)
+        * GEOS >=3.3 (Shapely 1.2.x requires only GEOS 3.1 but YMMV)
         
         Installing Shapely
         ==================
@@ -50,7 +50,27 @@ Description: =======
         
         .. code-block:: console
         
-            $ pip install -U shapely
+            $ pip install shapely
+        
+        If you've installed GEOS to a non-standard location, you can use the
+        geos-config program to find compiler and linker options.
+        
+        .. code-block:: console
+        
+            $ CFLAGS=`geos-config --cflags` LDFLAGS=`geos-config --clibs` pip install shapely
+        
+        If your system's GEOS version is < 3.3.0 you cannot use Shapely 1.3+ and must
+        stick to 1.2.x as shown below.
+        
+        .. code-block:: console
+        
+            $ pip install shapely<1.3
+        
+        Or, if you're using pip 6+
+        
+        .. code-block:: console
+        
+            $ pip install shapely~=1.2
         
         Shapely is also provided by popular Python distributions like Canopy (Enthought)
         and Anaconda (Continuum Analytics).
@@ -195,6 +215,16 @@ Description: =======
         Changes
         =======
         
+        1.5.3 (2015-01-12)
+        ------------------
+        - Fixed ownership and potential memory leak in polygonize (#223).
+        - Wider release of binary wheels for OS X.
+        
+        1.5.2 (2015-01-04)
+        ------------------
+        - Fail installation if GEOS dependency is not met, preventing update breakage
+          (#218, #219).
+        
         1.5.1 (2014-12-04)
         ------------------
         - Restore geometry hashing (#209).

{Shapely-1.5.1 → Shapely-1.5.3}/README.rst

@@ -25,10 +25,10 @@ but can be readily integrated with packages that are. For more details, see:
 Requirements
 ============
 
-Shapely 1.5 requires
+Shapely 1.5.x requires
 
 * Python >=2.6 (including Python 3.x)
-* GEOS >=3.3 (Shapely 1.2 requires only GEOS 3.1 but YMMV)
+* GEOS >=3.3 (Shapely 1.2.x requires only GEOS 3.1 but YMMV)
 
 Installing Shapely
 ==================
@@ -42,7 +42,27 @@ system library path, and install Shapely from the Python package index.
 
 .. code-block:: console
 
-    $ pip install -U shapely
+    $ pip install shapely
+
+If you've installed GEOS to a non-standard location, you can use the
+geos-config program to find compiler and linker options.
+
+.. code-block:: console
+
+    $ CFLAGS=`geos-config --cflags` LDFLAGS=`geos-config --clibs` pip install shapely
+
+If your system's GEOS version is < 3.3.0 you cannot use Shapely 1.3+ and must
+stick to 1.2.x as shown below.
+
+.. code-block:: console
+
+    $ pip install shapely<1.3
+
+Or, if you're using pip 6+
+
+.. code-block:: console
+
+    $ pip install shapely~=1.2
 
 Shapely is also provided by popular Python distributions like Canopy (Enthought)
 and Anaconda (Continuum Analytics).

{Shapely-1.5.1 → Shapely-1.5.3/Shapely.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: Shapely
-Version: 1.5.1
+Version: 1.5.3
 Summary: Geometric objects, predicates, and operations
 Home-page: https://github.com/Toblerity/Shapely
 Author: Sean Gillies
@@ -33,10 +33,10 @@ Description: =======
         Requirements
         ============
         
-        Shapely 1.5 requires
+        Shapely 1.5.x requires
         
         * Python >=2.6 (including Python 3.x)
-        * GEOS >=3.3 (Shapely 1.2 requires only GEOS 3.1 but YMMV)
+        * GEOS >=3.3 (Shapely 1.2.x requires only GEOS 3.1 but YMMV)
         
         Installing Shapely
         ==================
@@ -50,7 +50,27 @@ Description: =======
         
         .. code-block:: console
         
-            $ pip install -U shapely
+            $ pip install shapely
+        
+        If you've installed GEOS to a non-standard location, you can use the
+        geos-config program to find compiler and linker options.
+        
+        .. code-block:: console
+        
+            $ CFLAGS=`geos-config --cflags` LDFLAGS=`geos-config --clibs` pip install shapely
+        
+        If your system's GEOS version is < 3.3.0 you cannot use Shapely 1.3+ and must
+        stick to 1.2.x as shown below.
+        
+        .. code-block:: console
+        
+            $ pip install shapely<1.3
+        
+        Or, if you're using pip 6+
+        
+        .. code-block:: console
+        
+            $ pip install shapely~=1.2
         
         Shapely is also provided by popular Python distributions like Canopy (Enthought)
         and Anaconda (Continuum Analytics).
@@ -195,6 +215,16 @@ Description: =======
         Changes
         =======
         
+        1.5.3 (2015-01-12)
+        ------------------
+        - Fixed ownership and potential memory leak in polygonize (#223).
+        - Wider release of binary wheels for OS X.
+        
+        1.5.2 (2015-01-04)
+        ------------------
+        - Fail installation if GEOS dependency is not met, preventing update breakage
+          (#218, #219).
+        
         1.5.1 (2014-12-04)
         ------------------
         - Restore geometry hashing (#209).

{Shapely-1.5.1 → Shapely-1.5.3}/Shapely.egg-info/SOURCES.txt

@@ -50,6 +50,7 @@ shapely/geometry/proxy.py
 shapely/speedups/__init__.py
 shapely/speedups/_speedups.c
 shapely/vectorized/__init__.py
+shapely/vectorized/_vectorized.c
 shapely/vectorized/_vectorized.pyx
 tests/__init__.py
 tests/binascii_hex.txt

Shapely-1.5.3/VERSION.txt

@@ -0,0 +1 @@
+1.5.3

{Shapely-1.5.1 → Shapely-1.5.3}/setup.py

@@ -2,15 +2,19 @@
 
 from __future__ import print_function
 
+import ctypes
+import ctypes.util
 try:
     # If possible, use setuptools
     from setuptools import setup
     from setuptools.extension import Extension
     from setuptools.command.build_ext import build_ext as distutils_build_ext
+    from setuptools.command.install import install
 except ImportError:
     from distutils.core import setup
     from distutils.extension import Extension
     from distutils.command.build_ext import build_ext as distutils_build_ext
+    from distutils.command.install import install
 from distutils.cmd import Command
 from distutils.errors import CCompilerError, DistutilsExecError, \
     DistutilsPlatformError
@@ -19,6 +23,7 @@ import errno
 import glob
 import os
 import platform
+import re
 import shutil
 import subprocess
 import sys
@@ -53,6 +58,74 @@ with open('CHANGES.txt', 'r', **open_kwds) as fp:
 
 long_description = readme + '\n\n' + credits + '\n\n' + changes
 
+# Fail installation if we can't find a GEOS shared library with the right
+# version. We ship it with Shapely for Windows, so no need to check on that
+# platform. Code below copied from shapely/geos.py.
+class InstallCommand(install):
+
+    def run(self):
+        def load_dll(libname, fallbacks=None):
+            lib = ctypes.util.find_library(libname)
+            if lib is not None:
+                try:
+                    return ctypes.CDLL(lib)
+                except OSError:
+                    pass
+            if fallbacks is not None:
+                for name in fallbacks:
+                    try:
+                        return ctypes.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'])
+        elif sys.platform == 'darwin':
+            if hasattr(sys, 'frozen'):
+                # .app file from py2app
+                alt_paths = [os.path.join(os.environ['RESOURCEPATH'],
+                             '..', 'Frameworks', 'libgeos_c.dylib')]
+            else:
+                alt_paths = [
+                    # The Framework build from Kyng Chaos:
+                    "/Library/Frameworks/GEOS.framework/Versions/Current/GEOS",
+                    # macports
+                    '/opt/local/lib/libgeos_c.dylib',
+                ]
+            _lgeos = load_dll('geos_c', fallbacks=alt_paths)
+        elif sys.platform == 'sunos5':
+            _lgeos = load_dll(
+                'geos_c', fallbacks=['libgeos_c.so.1', 'libgeos_c.so'])
+        else:  # other *nix systems
+            _lgeos = load_dll(
+                'geos_c', fallbacks=['libgeos_c.so.1', 'libgeos_c.so'])
+
+        GEOSversion = _lgeos.GEOSversion
+        GEOSversion.restype = ctypes.c_char_p
+        GEOSversion.argtypes = []
+        geos_version_string = GEOSversion()
+        if sys.version_info[0] >= 3:
+            geos_version_string = geos_version_string.decode('ascii')
+        res = re.findall(r'(\d+)\.(\d+)\.(\d+)', geos_version_string)
+        assert len(res) == 2, res
+        geos_version = tuple(int(x) for x in res[0])
+        shapely_version = tuple(int(x) for x in version.split('.'))
+
+        if shapely_version >= (1, 3):
+            if geos_version >= (3, 3):
+                install.run(self)
+            else:
+                print(
+                    "Shapely >= 1.3 requires GEOS >= 3.3. "
+                    "Install GEOS 3.3+ and reinstall Shapely.")
+                sys.exit(1)
+
 setup_args = dict(
     name                = 'Shapely',
     version             = version,
@@ -74,7 +147,7 @@ setup_args = dict(
         'shapely.speedups',
         'shapely.vectorized',
     ],
-    cmdclass = {},
+    cmdclass = {'install': InstallCommand},
     classifiers         = [
         'Development Status :: 5 - Production/Stable',
         'Intended Audience :: Developers',
@@ -89,7 +162,7 @@ setup_args = dict(
     data_files         = [('shapely', ['shapely/_geos.pxi'])]
 )
 
-# Add DLLs for Windows
+# Add DLLs to Windows packages.
 if sys.platform == 'win32':
     try:
         os.mkdir('shapely/DLLs')

Shapely-1.5.3/shapely/__init__.py

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

{Shapely-1.5.1 → Shapely-1.5.3}/shapely/geos.py

@@ -60,18 +60,25 @@ if sys.platform.startswith('linux'):
     free.restype = None
 
 elif sys.platform == 'darwin':
-    if hasattr(sys, 'frozen'):
-        # .app file from py2app
-        alt_paths = [os.path.join(os.environ['RESOURCEPATH'],
-                     '..', 'Frameworks', 'libgeos_c.dylib')]
+    # First test to see if this is a delocated wheel with a GEOS dylib.
+    geos_whl_dylib = os.path.abspath(
+            os.path.join(os.path.dirname(__file__), '.dylibs/GEOS'))
+    if os.path.exists(geos_whl_dylib):
+        _lgeos = CDLL(geos_whl_dylib)
     else:
-        alt_paths = [
-            # The Framework build from Kyng Chaos:
-            "/Library/Frameworks/GEOS.framework/Versions/Current/GEOS",
-            # macports
-            '/opt/local/lib/libgeos_c.dylib',
-        ]
-    _lgeos = load_dll('geos_c', fallbacks=alt_paths)
+        if hasattr(sys, 'frozen'):
+            # .app file from py2app
+            alt_paths = [os.path.join(os.environ['RESOURCEPATH'],
+                         '..', 'Frameworks', 'libgeos_c.dylib')]
+        else:
+            alt_paths = [
+                # The Framework build from Kyng Chaos
+                "/Library/Frameworks/GEOS.framework/Versions/Current/GEOS",
+                # macports
+                '/opt/local/lib/libgeos_c.dylib',
+            ]
+        _lgeos = load_dll('geos_c', fallbacks=alt_paths)
+
     free = load_dll('c').free
     free.argtypes = [c_void_p]
     free.restype = None

{Shapely-1.5.1 → Shapely-1.5.3}/shapely/ops.py

@@ -51,7 +51,7 @@ class CollectionOperator(object):
         for g in collection.geoms:
             clone = lgeos.GEOSGeom_clone(g._geom)
             g = geom_factory(clone)
-            g._owned = False
+            g._other_owned = False
             yield g
 
     def polygonize_full(self, lines):

{Shapely-1.5.1 → Shapely-1.5.3}/shapely/speedups/_speedups.c

@@ -1,4 +1,4 @@
-/* Generated by Cython 0.21 */
+/* Generated by Cython 0.21.2 */
 
 #define PY_SSIZE_T_CLEAN
 #ifndef CYTHON_USE_PYLONG_INTERNALS
@@ -19,7 +19,7 @@
 #elif PY_VERSION_HEX < 0x02060000 || (0x03000000 <= PY_VERSION_HEX && PY_VERSION_HEX < 0x03020000)
     #error Cython requires Python 2.6+ or Python 3.2+.
 #else
-#define CYTHON_ABI "0_21"
+#define CYTHON_ABI "0_21_2"
 #include <stddef.h>
 #ifndef offsetof
 #define offsetof(type, member) ( (size_t) & ((type*)0) -> member )
@@ -73,8 +73,6 @@
 #if PY_MAJOR_VERSION >= 3
   #define Py_TPFLAGS_CHECKTYPES 0
   #define Py_TPFLAGS_HAVE_INDEX 0
-#endif
-#if PY_MAJOR_VERSION >= 3
   #define Py_TPFLAGS_HAVE_NEWBUFFER 0
 #endif
 #if PY_VERSION_HEX < 0x030400a1 && !defined(Py_TPFLAGS_HAVE_FINALIZE)
@@ -101,10 +99,12 @@
 #if CYTHON_COMPILING_IN_PYPY
   #define __Pyx_PyUnicode_Concat(a, b)      PyNumber_Add(a, b)
   #define __Pyx_PyUnicode_ConcatSafe(a, b)  PyNumber_Add(a, b)
+  #define __Pyx_PyFrozenSet_Size(s)         PyObject_Size(s)
 #else
   #define __Pyx_PyUnicode_Concat(a, b)      PyUnicode_Concat(a, b)
   #define __Pyx_PyUnicode_ConcatSafe(a, b)  ((unlikely((a) == Py_None) || unlikely((b) == Py_None)) ? \
       PyNumber_Add(a, b) : __Pyx_PyUnicode_Concat(a, b))
+  #define __Pyx_PyFrozenSet_Size(s)         PySet_Size(s)
 #endif
 #define __Pyx_PyString_FormatSafe(a, b)   ((unlikely((a) == Py_None)) ? PyNumber_Remainder(a, b) : __Pyx_PyString_Format(a, b))
 #define __Pyx_PyUnicode_FormatSafe(a, b)  ((unlikely((a) == Py_None)) ? PyNumber_Remainder(a, b) : PyUnicode_Format(a, b))
@@ -151,6 +151,11 @@
 #if PY_MAJOR_VERSION >= 3
   #define PyBoolObject                 PyLongObject
 #endif
+#if PY_MAJOR_VERSION >= 3 && CYTHON_COMPILING_IN_PYPY
+  #ifndef PyUnicode_InternFromString
+    #define PyUnicode_InternFromString(s) PyUnicode_FromString(s)
+  #endif
+#endif
 #if PY_VERSION_HEX < 0x030200A4
   typedef long Py_hash_t;
   #define __Pyx_PyInt_FromHash_t PyInt_FromLong
@@ -160,7 +165,9 @@
   #define __Pyx_PyInt_AsHash_t   PyInt_AsSsize_t
 #endif
 #if PY_MAJOR_VERSION >= 3
-  #define PyMethod_New(func, self, klass) ((self) ? PyMethod_New(func, self) : PyInstanceMethod_New(func))
+  #define __Pyx_PyMethod_New(func, self, klass) ((self) ? PyMethod_New(func, self) : PyInstanceMethod_New(func))
+#else
+  #define __Pyx_PyMethod_New(func, self, klass) PyMethod_New(func, self, klass)
 #endif
 #ifndef CYTHON_INLINE
   #if defined(__GNUC__)
@@ -3206,12 +3213,10 @@ static PyObject *__pyx_pf_7shapely_8speedups_9_speedups_4geos_linearring_from_py
  */
       __pyx_t_4 = (GEOSisClosed_r(__pyx_v_handle, __pyx_v_g) != 0);
       if (__pyx_t_4) {
-        goto __pyx_L8_next_and;
       } else {
         __pyx_t_5 = __pyx_t_4;
         goto __pyx_L7_bool_binop_done;
       }
-      __pyx_L8_next_and:;
       __pyx_t_4 = ((__pyx_v_m >= 4) != 0);
       __pyx_t_5 = __pyx_t_4;
       __pyx_L7_bool_binop_done:;
@@ -3605,20 +3610,16 @@ static PyObject *__pyx_pf_7shapely_8speedups_9_speedups_4geos_linearring_from_py
  */
       __pyx_t_5 = (((__pyx_v_cp[0]) != (__pyx_v_cp[(__pyx_v_sm * (__pyx_v_m - 1))])) != 0);
       if (!__pyx_t_5) {
-        goto __pyx_L22_next_or;
       } else {
         __pyx_t_4 = __pyx_t_5;
         goto __pyx_L21_bool_binop_done;
       }
-      __pyx_L22_next_or:;
       __pyx_t_5 = (((__pyx_v_cp[__pyx_v_sn]) != (__pyx_v_cp[((__pyx_v_sm * (__pyx_v_m - 1)) + __pyx_v_sn)])) != 0);
       if (!__pyx_t_5) {
-        goto __pyx_L23_next_or;
       } else {
         __pyx_t_4 = __pyx_t_5;
         goto __pyx_L21_bool_binop_done;
       }
-      __pyx_L23_next_or:;
 
       /* "shapely/speedups/_speedups.pyx":236
  *         # If not, we'll have to close the ring later
@@ -3629,12 +3630,10 @@ static PyObject *__pyx_pf_7shapely_8speedups_9_speedups_4geos_linearring_from_py
  */
       __pyx_t_5 = ((__pyx_v_n == 3) != 0);
       if (__pyx_t_5) {
-        goto __pyx_L24_next_and;
       } else {
         __pyx_t_4 = __pyx_t_5;
         goto __pyx_L21_bool_binop_done;
       }
-      __pyx_L24_next_and:;
       __pyx_t_5 = (((__pyx_v_cp[(2 * __pyx_v_sn)]) != (__pyx_v_cp[((__pyx_v_sm * (__pyx_v_m - 1)) + (2 * __pyx_v_sn))])) != 0);
       __pyx_t_4 = __pyx_t_5;
       __pyx_L21_bool_binop_done:;
@@ -4137,12 +4136,10 @@ static PyObject *__pyx_pf_7shapely_8speedups_9_speedups_4geos_linearring_from_py
  */
       __pyx_t_4 = ((__pyx_v_m == 3) != 0);
       if (!__pyx_t_4) {
-        goto __pyx_L49_next_or;
       } else {
         __pyx_t_5 = __pyx_t_4;
         goto __pyx_L48_bool_binop_done;
       }
-      __pyx_L49_next_or:;
       __pyx_t_18 = __Pyx_GetItemInt(__pyx_v_ob, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(__pyx_t_18 == NULL)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 295; __pyx_clineno = __LINE__; goto __pyx_L11_except_error;};
       __Pyx_GOTREF(__pyx_t_18);
       __pyx_t_6 = __Pyx_GetItemInt(__pyx_t_18, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(__pyx_t_6 == NULL)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 295; __pyx_clineno = __LINE__; goto __pyx_L11_except_error;};
@@ -4159,12 +4156,10 @@ static PyObject *__pyx_pf_7shapely_8speedups_9_speedups_4geos_linearring_from_py
       __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_18); if (unlikely(__pyx_t_4 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 295; __pyx_clineno = __LINE__; goto __pyx_L11_except_error;}
       __Pyx_DECREF(__pyx_t_18); __pyx_t_18 = 0;
       if (!__pyx_t_4) {
-        goto __pyx_L50_next_or;
       } else {
         __pyx_t_5 = __pyx_t_4;
         goto __pyx_L48_bool_binop_done;
       }
-      __pyx_L50_next_or:;
       __pyx_t_18 = __Pyx_GetItemInt(__pyx_v_ob, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(__pyx_t_18 == NULL)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 295; __pyx_clineno = __LINE__; goto __pyx_L11_except_error;};
       __Pyx_GOTREF(__pyx_t_18);
       __pyx_t_1 = __Pyx_GetItemInt(__pyx_t_18, 1, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(__pyx_t_1 == NULL)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 295; __pyx_clineno = __LINE__; goto __pyx_L11_except_error;};
@@ -6136,20 +6131,16 @@ static PyObject *__pyx_f_7shapely_8speedups_9_speedups_affine_transform(PyObject
   __Pyx_GOTREF(__pyx_t_9);
   __pyx_t_2 = (__Pyx_PyString_Equals(__pyx_t_9, __pyx_n_s_Point, Py_EQ)); if (unlikely(__pyx_t_2 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 471; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   if (!__pyx_t_2) {
-    goto __pyx_L14_next_or;
   } else {
     __pyx_t_29 = __pyx_t_2;
     goto __pyx_L12_bool_binop_done;
   }
-  __pyx_L14_next_or:;
   __pyx_t_2 = (__Pyx_PyString_Equals(__pyx_t_9, __pyx_n_s_LineString, Py_EQ)); if (unlikely(__pyx_t_2 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 471; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   if (!__pyx_t_2) {
-    goto __pyx_L13_next_or;
   } else {
     __pyx_t_29 = __pyx_t_2;
     goto __pyx_L12_bool_binop_done;
   }
-  __pyx_L13_next_or:;
   __pyx_t_2 = (__Pyx_PyString_Equals(__pyx_t_9, __pyx_n_s_LinearRing, Py_EQ)); if (unlikely(__pyx_t_2 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 471; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_t_29 = __pyx_t_2;
   __pyx_L12_bool_binop_done:;
@@ -6470,12 +6461,10 @@ static PyObject *__pyx_f_7shapely_8speedups_9_speedups_affine_transform(PyObject
   __pyx_t_29 = __Pyx_PyObject_IsTrue(__pyx_t_9); if (unlikely(__pyx_t_29 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 495; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;
   if (!__pyx_t_29) {
-    goto __pyx_L19_next_or;
   } else {
     __pyx_t_2 = __pyx_t_29;
     goto __pyx_L18_bool_binop_done;
   }
-  __pyx_L19_next_or:;
   __pyx_t_9 = __Pyx_PyObject_GetAttrStr(__pyx_v_geom, __pyx_n_s_type); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 495; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_9);
   __pyx_t_29 = (__Pyx_PyString_Equals(__pyx_t_9, __pyx_n_s_GeometryCollection, Py_EQ)); if (unlikely(__pyx_t_29 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 495; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -7427,7 +7416,6 @@ PyMODINIT_FUNC PyInit__speedups(void)
   if (__pyx_m) {
     if (__pyx_d) {
       __Pyx_AddTraceback("init shapely.speedups._speedups", __pyx_clineno, __pyx_lineno, __pyx_filename);
-      Py_DECREF(__pyx_d); __pyx_d = 0;
     }
     Py_DECREF(__pyx_m); __pyx_m = 0;
   } else if (!PyErr_Occurred()) {
@@ -7980,6 +7968,13 @@ static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb, PyObject
     }
     PyErr_SetObject(type, value);
     if (tb) {
+#if CYTHON_COMPILING_IN_PYPY
+        PyObject *tmp_type, *tmp_value, *tmp_tb;
+        PyErr_Fetch(tmp_type, tmp_value, tmp_tb);
+        Py_INCREF(tb);
+        PyErr_Restore(tmp_type, tmp_value, tb);
+        Py_XDECREF(tmp_tb);
+#else
         PyThreadState *tstate = PyThreadState_GET();
         PyObject* tmp_tb = tstate->curexc_traceback;
         if (tb != tmp_tb) {
@@ -7987,6 +7982,7 @@ static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb, PyObject
             tstate->curexc_traceback = tb;
             Py_XDECREF(tmp_tb);
         }
+#endif
     }
 bad:
     Py_XDECREF(owned_instance);
@@ -8512,12 +8508,11 @@ static PyObject *__Pyx_CyFunction_descr_get(PyObject *func, PyObject *obj, PyObj
     if (m->flags & __Pyx_CYFUNCTION_CLASSMETHOD) {
         if (type == NULL)
             type = (PyObject *)(Py_TYPE(obj));
-        return PyMethod_New(func,
-                            type, (PyObject *)(Py_TYPE(type)));
+        return __Pyx_PyMethod_New(func, type, (PyObject *)(Py_TYPE(type)));
     }
     if (obj == Py_None)
         obj = NULL;
-    return PyMethod_New(func, obj, type);
+    return __Pyx_PyMethod_New(func, obj, type);
 }
 static PyObject*
 __Pyx_CyFunction_repr(__pyx_CyFunctionObject *op)