Correct autodetection of vsizip based shapefiles depends on GDAL 3.1

qgis · Feb 12, 2020 · 50bdd36 · 50bdd36
1 parent 54eba4a
commit 50bdd36
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/tests/src/python/test_provider_shapefile.py b/tests/src/python/test_provider_shapefile.py
@@ -19,6 +19,7 @@
 import osgeo.ogr
 import sys
 
+from osgeo import gdal
 from qgis.core import (
     QgsApplication,
     QgsSettings,
@@ -662,11 +663,13 @@ def testEncoding(self):
         self.assertEqual(vl.dataProvider().encoding(), 'windows-1252')
         self.assertEqual(next(vl.getFeatures())[1], 'äöü')
 
-        file_path = os.path.join(TEST_DATA_DIR, 'shapefile', 'windows-1252.zip')
-        vl = QgsVectorLayer('/vsizip/{}'.format(file_path))
-        self.assertTrue(vl.isValid())
-        self.assertEqual(vl.dataProvider().encoding(), 'windows-1252')
-        self.assertEqual(next(vl.getFeatures())[1], 'äöü')
+        if int(gdal.VersionInfo('VERSION_NUM')) >= GDAL_COMPUTE_VERSION(3, 1, 0):
+            # correct autodetection of vsizip based shapefiles depends on GDAL 3.1
+            file_path = os.path.join(TEST_DATA_DIR, 'shapefile', 'windows-1252.zip')
+            vl = QgsVectorLayer('/vsizip/{}'.format(file_path))
+            self.assertTrue(vl.isValid())
+            self.assertEqual(vl.dataProvider().encoding(), 'windows-1252')
+            self.assertEqual(next(vl.getFeatures())[1], 'äöü')
 
         file_path = os.path.join(TEST_DATA_DIR, 'shapefile', 'system_encoding.shp')
         vl = QgsVectorLayer(file_path)