summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2013-07-06 14:26:28 +0200
committerTim Graham <timograham@gmail.com>2013-08-02 10:45:12 -0400
commitf942554cf3f5da7efe3e66832fd58b9bdd05f2e5 (patch)
treee4b4e31a5f370f204502626724c46eb0b644a740
parente710f6dc56731b52f84864e7cb199dc4a8f881e7 (diff)
[1.6.x] Tweaked proj string regex in gis tests
Backport of 4367c637d6 from master
-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 f33883e9f1..a493838323 100644
--- a/django/contrib/gis/tests/test_spatialrefsys.py
+++ b/django/contrib/gis/tests/test_spatialrefsys.py
@@ -22,7 +22,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,