Renamed PROJ.4 to PROJ.

2 files changed, 9 insertions, 9 deletions

diff --git a/tests/gis_tests/gdal_tests/test_srs.py b/tests/gis_tests/gdal_tests/test_srs.py
index 27974c8b80..1dfa05b1d0 100644
--- a/tests/gis_tests/gdal_tests/test_srs.py
+++ b/tests/gis_tests/gdal_tests/test_srs.py
@@ -181,7 +181,7 @@ class SpatialRefTest(SimpleTestCase):
             )
 
     def test04_proj(self):
-        "Test PROJ.4 import and export."
+        """PROJ import and export."""
         proj_parts = [
             '+proj=longlat', '+ellps=WGS84', '+towgs84=0,0,0,0,0,0,0', '+datum=WGS84', '+no_defs'
         ]
diff --git a/tests/gis_tests/test_spatialrefsys.py b/tests/gis_tests/test_spatialrefsys.py
index 6c5a1b9218..e4638baa31 100644
--- a/tests/gis_tests/test_spatialrefsys.py
+++ b/tests/gis_tests/test_spatialrefsys.py
@@ -11,7 +11,7 @@ test_srs = ({
     # Only the beginning, because there are differences depending on installed libs
     'srtext': 'GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84"',
     # +ellps=WGS84 has been removed in the 4326 proj string in proj-4.8
-    'proj4_re': r'\+proj=longlat (\+ellps=WGS84 )?(\+datum=WGS84 |\+towgs84=0,0,0,0,0,0,0 )\+no_defs ?',
+    'proj_re': r'\+proj=longlat (\+ellps=WGS84 )?(\+datum=WGS84 |\+towgs84=0,0,0,0,0,0,0 )\+no_defs ?',
     'spheroid': 'WGS 84', 'name': 'WGS 84',
     'geographic': True, 'projected': False, 'spatialite': True,
     # From proj's "cs2cs -le" and Wikipedia (semi-minor only)
@@ -37,9 +37,9 @@ test_srs = ({
         '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 ){4}\+x_0=600000 \+y_0=4000000 (\+ellps=GRS80 )?'
-                r'(\+datum=NAD83 |\+towgs84=0,0,0,0,0,0,0 )?\+units=m \+no_defs ?',
+    'proj_re': r'\+proj=lcc (\+lat_1=30.28333333333333? |\+lat_2=28.38333333333333? |\+lat_0=27.83333333333333? |'
+               r'\+lon_0=-99 ){4}\+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,
     # From proj's "cs2cs -le" and Wikipedia (semi-minor only)
@@ -74,10 +74,10 @@ class SpatialRefSysTest(TestCase):
 
             self.assertEqual(sd['auth_srid'], srs.auth_srid)
 
-            # No proj.4 and different srtext on oracle backends :(
+            # No PROJ and different srtext on oracle backends :(
             if postgis:
                 self.assertTrue(srs.wkt.startswith(sd['srtext']))
-                self.assertRegex(srs.proj4text, sd['proj4_re'])
+                self.assertRegex(srs.proj4text, sd['proj_re'])
 
     def test_osr(self):
         """
@@ -90,14 +90,14 @@ class SpatialRefSysTest(TestCase):
             self.assertEqual(sd['projected'], sr.projected)
 
             if not (spatialite and not sd['spatialite']):
-                # Can't get 'NAD83 / Texas South Central' from PROJ.4 string
+                # Can't get 'NAD83 / Texas South Central' from PROJ string
                 # on SpatiaLite
                 self.assertTrue(sr.name.startswith(sd['name']))
 
             # Testing the SpatialReference object directly.
             if postgis or spatialite:
                 srs = sr.srs
-                self.assertRegex(srs.proj4, sd['proj4_re'])
+                self.assertRegex(srs.proj, sd['proj_re'])
                 self.assertTrue(srs.wkt.startswith(sd['srtext']))
 
     def test_ellipsoid(self):