Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

gis: gdal: Fixed Driver and DataSource bug reported by David Hancock …

…in django-users and reproduced by tlp.

git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7003 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 298074d5b86e6669b9e43abc77c26ee5be21ead2 1 parent 1d5e689
@jbronn jbronn authored
View
3  django/contrib/gis/gdal/datasource.py
@@ -67,8 +67,7 @@ def __init__(self, ds_input, ds_driver=False, write=False):
# Registering all the drivers, this needs to be done
# _before_ we try to open up a data source.
- if not get_driver_count() and not register_all():
- raise OGRException('Could not register all the OGR data source drivers!')
+ if not get_driver_count(): register_all()
if isinstance(ds_input, basestring):
# The data source driver is a void pointer.
View
5 django/contrib/gis/gdal/driver.py
@@ -56,9 +56,8 @@ def __str__(self):
def _register(self):
"Attempts to register all the data source drivers."
# Only register all if the driver count is 0 (or else all drivers
- # will be registered over and over again)
- if not self.driver_count and not register_all():
- raise OGRException('Could not register all the OGR data source drivers!')
+ # will be registered over and over again)
+ if not self.driver_count: register_all()
# Driver properties
@property
View
3  django/contrib/gis/gdal/prototypes/generation.py
@@ -103,6 +103,9 @@ def void_output(func, argtypes, errcheck=True):
# return void, rather than a status code.
func.restype = c_int
func.errcheck = check_errcode
+ else:
+ func.restype = None
+
return func
def voidptr_output(func, argtypes):
Please sign in to comment.
Something went wrong with that request. Please try again.