Django

Code

Changeset 7127

Show
Ignore:
Timestamp:
02/17/08 21:03:25 (5 months ago)
Author:
jbronn
Message:

gis: gdal: Fixed new _version_info definition for win32 platforms; made GeoJSON regex more strict.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/gis/django/contrib/gis/gdal/geometries.py

    r7113 r7127  
    6363hex_regex = re.compile(r'^[0-9A-F]+$', re.I) 
    6464wkt_regex = re.compile(r'^(?P<type>POINT|LINESTRING|LINEARRING|POLYGON|MULTIPOINT|MULTILINESTRING|MULTIPOLYGON|GEOMETRYCOLLECTION)[ACEGIMLONPSRUTY\d,\.\-\(\) ]+$', re.I) 
    65 json_regex = re.compile(r'^\{.+\}$') 
     65json_regex = re.compile(r'^\{[\s\w,\.\"\'\:\[\]]+\}$') 
    6666 
    6767#### OGRGeometry Class #### 

  • django/branches/gis/django/contrib/gis/gdal/libgdal.py

    r7107 r7127  
    5151 
    5252# Returns GDAL library version information with the given key. 
    53 _version_info = lgdal.GDALVersionInfo 
     53_version_info = std_call('GDALVersionInfo') 
    5454_version_info.argtypes = [c_char_p] 
    5555_version_info.restype = c_char_p