From 86988dd890671aa8935f86eab2bbe22ad917db70 Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Fri, 8 Jun 2018 20:20:01 +0200 Subject: [PATCH] Refs #29483 -- Relaxed WGS 84 check regex With GDAL 2.3, the exact string changed again. --- tests/gis_tests/gdal_tests/test_ds.py | 7 +------ 1 file changed, 1 insertion(+), 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 = (