diff options
| author | Justin Bronn <jbronn@gmail.com> | 2008-02-18 03:03:25 +0000 |
|---|---|---|
| committer | Justin Bronn <jbronn@gmail.com> | 2008-02-18 03:03:25 +0000 |
| commit | bdab7abe2c57b6cd3fd1a94c76e7c79cbaf36157 (patch) | |
| tree | 961a35c9b9ccf82c75af0054ae7ee9ba58b14feb | |
| parent | ccf9baca863ad56c042fa551a9adece437af2901 (diff) | |
gis: gdal: Fixed new `_version_info` definition for win32 platforms; made GeoJSON regex more strict.
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7127 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/contrib/gis/gdal/geometries.py | 2 | ||||
| -rw-r--r-- | django/contrib/gis/gdal/libgdal.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/django/contrib/gis/gdal/geometries.py b/django/contrib/gis/gdal/geometries.py index 21b8a1a27c..a39838c6ce 100644 --- a/django/contrib/gis/gdal/geometries.py +++ b/django/contrib/gis/gdal/geometries.py @@ -62,7 +62,7 @@ from django.contrib.gis.gdal.prototypes.srs import clone_srs # Regular expressions for recognizing HEXEWKB and WKT. hex_regex = re.compile(r'^[0-9A-F]+$', re.I) wkt_regex = re.compile(r'^(?P<type>POINT|LINESTRING|LINEARRING|POLYGON|MULTIPOINT|MULTILINESTRING|MULTIPOLYGON|GEOMETRYCOLLECTION)[ACEGIMLONPSRUTY\d,\.\-\(\) ]+$', re.I) -json_regex = re.compile(r'^\{.+\}$') +json_regex = re.compile(r'^\{[\s\w,\.\"\'\:\[\]]+\}$') #### OGRGeometry Class #### class OGRGeometry(object): diff --git a/django/contrib/gis/gdal/libgdal.py b/django/contrib/gis/gdal/libgdal.py index 28d2d49907..4e26cf0ff3 100644 --- a/django/contrib/gis/gdal/libgdal.py +++ b/django/contrib/gis/gdal/libgdal.py @@ -50,7 +50,7 @@ def std_call(func): #### Version-information functions. #### # Returns GDAL library version information with the given key. -_version_info = lgdal.GDALVersionInfo +_version_info = std_call('GDALVersionInfo') _version_info.argtypes = [c_char_p] _version_info.restype = c_char_p |