summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2013-07-06 14:26:28 +0200
committerClaude Paroz <claude@2xlibre.net>2013-07-06 14:26:28 +0200
commit4367c637d6989ad2bef2168e46485c65dd503b82 (patch)
tree512ffa01754a366feb847d76fb3c82fa490e2542
parent1116df0751cc0d5862590b08adfffe7bacd6bf43 (diff)
Tweaked proj string regex in gis tests
-rw-r--r--django/contrib/gis/tests/test_spatialrefsys.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/contrib/gis/tests/test_spatialrefsys.py b/django/contrib/gis/tests/test_spatialrefsys.py
index 8daa6acc23..5bb6a70206 100644
--- a/django/contrib/gis/tests/test_spatialrefsys.py
+++ b/django/contrib/gis/tests/test_spatialrefsys.py
@@ -23,7 +23,7 @@ test_srs = ({'srid' : 4326,
'auth_srid' : 32140,
'srtext' : 'PROJCS["NAD83 / Texas South Central",GEOGCS["NAD83",DATUM["North_American_Datum_1983",SPHEROID["GRS 1980"',
'proj4_re' : r'\+proj=lcc \+lat_1=30.28333333333333 \+lat_2=28.38333333333333 \+lat_0=27.83333333333333 '
- r'\+lon_0=-99 \+x_0=600000 \+y_0=4000000 \+ellps=GRS80 '
+ r'\+lon_0=-99 \+x_0=600000 \+y_0=4000000 (\+ellps=GRS80 )?'
r'(\+datum=NAD83 |\+towgs84=0,0,0,0,0,0,0)?\+units=m \+no_defs ',
'spheroid' : 'GRS 1980', 'name' : 'NAD83 / Texas South Central',
'geographic' : False, 'projected' : True, 'spatialite' : False,