diff options
| author | Claude Paroz <claude@2xlibre.net> | 2018-06-08 20:20:01 +0200 |
|---|---|---|
| committer | Claude Paroz <claude@2xlibre.net> | 2018-06-09 09:20:52 +0200 |
| commit | 69e2d173e5082a8c475586cff7920b2fb962c333 (patch) | |
| tree | a2dc44db124a51a7115270aa981f1034126ef7df | |
| parent | 36c35aba094ac0b27620328bd48099bc971aca20 (diff) | |
[2.1.x] Refs #29483 -- Relaxed WGS 84 check regex
With GDAL 2.3, the exact string changed again.
Backport of 86988dd890671aa8935f86eab2bbe22ad917db70 from master.
| -rw-r--r-- | tests/gis_tests/gdal_tests/test_ds.py | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/tests/gis_tests/gdal_tests/test_ds.py b/tests/gis_tests/gdal_tests/test_ds.py index 34c3953fd5..ea0cec9211 100644 --- a/tests/gis_tests/gdal_tests/test_ds.py +++ b/tests/gis_tests/gdal_tests/test_ds.py @@ -15,12 +15,7 @@ wgs_84_wkt = ( '0.017453292519943295]]' ) # Using a regex because of small differences depending on GDAL versions. -# AUTHORITY part has been added in GDAL 2.2. -wgs_84_wkt_regex = ( - r'^GEOGCS\["GCS_WGS_1984",DATUM\["WGS_1984",SPHEROID\["WGS_(19)?84",' - r'6378137,298.257223563\]\],PRIMEM\["Greenwich",0\],UNIT\["Degree",' - r'0.017453292519943295\](,AUTHORITY\["EPSG","4326"\])?\]$' -) +wgs_84_wkt_regex = r'^GEOGCS\["(GCS_)?WGS[ _](19)?84".*$' # List of acceptable data sources. ds_list = ( |