Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[1.0.X] Fixed `check_geom` and `check_srs` to accept larger sized poi…

…nter addresses as returned by some platforms (including OpenBSD 4.4 and Fedora 8).

Backport of r9693 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9694 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 94b83db4995ea8b763fef607141a246cb5c52c37 1 parent 1f2e21b
Justin Bronn jbronn authored
Showing with 2 additions and 2 deletions.
  1. +2 −2 django/contrib/gis/gdal/prototypes/errcheck.py
4 django/contrib/gis/gdal/prototypes/errcheck.py
View
@@ -71,7 +71,7 @@ def check_geom(result, func, cargs):
"Checks a function that returns a geometry."
# OGR_G_Clone may return an integer, even though the
# restype is set to c_void_p
- if isinstance(result, int):
+ if isinstance(result, (int, long)):
result = c_void_p(result)
if not result:
raise OGRException('Invalid geometry pointer returned from "%s".' % func.__name__)
@@ -85,7 +85,7 @@ def check_geom_offset(result, func, cargs, offset=-1):
### Spatial Reference error-checking routines ###
def check_srs(result, func, cargs):
- if isinstance(result, int):
+ if isinstance(result, (int, long)):
result = c_void_p(result)
if not result:
raise SRSException('Invalid spatial reference pointer returned from "%s".' % func.__name__)
Please sign in to comment.
Something went wrong with that request. Please try again.