Ticket #12450: geosfree.diff

django/contrib/gis/geos/prototypes/errcheck.py

@@ -3 +3 @@
 """
 from ctypes import c_void_p, string_at, CDLL
 from django.contrib.gis.geos.error import GEOSException
-from django.contrib.gis.geos.libgeos import lgeos, GEOS_VERSION
+from django.contrib.gis.geos.libgeos import lgeos
 
 # Getting the `free` routine used to free the memory allocated for
 # string pointers returned by GEOS.
-if GEOS_VERSION >= (3, 1, 0):
-    # In versions 3.1 and above, `GEOSFree` was added to the C API
+try:
+    # In versions 3.1.1 and above, `GEOSFree` was added to the C API
     # because `free` isn't always available on all platforms.
     free = lgeos.GEOSFree
-    free.argtypes = [c_void_p]
-    free.restype = None
-else:
+except AttributeError:
     # Getting the `free` routine from the C library of the platform.
     # The C library is obtained by passing None into `CDLL`.
     libc = CDLL(None)
     free = libc.free
+else:
+    free.argtypes = [c_void_p]
+    free.restype = None
 
 ### ctypes error checking routines ###
 def last_arg_byref(args):