Skip to content

Commit

Permalink
Fix some unwanted GDAL test backports
Browse files Browse the repository at this point in the history
These were only needed because of other changes in the 3.18/master
branches (which shouldn't be backported)
  • Loading branch information
nyalldawson committed Mar 1, 2021
1 parent 81ba6c0 commit 015f593
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
Expand Up @@ -101,7 +101,7 @@ def get_param_value_and_expected_string_for_custom_crs(proj_def):
crs = QgsCoordinateReferenceSystem.fromProj(proj_def)
custom_crs = f'proj4: {proj_def}'
if QgsProjUtils.projVersionMajor() >= 6:
return custom_crs, crs.toWkt(QgsCoordinateReferenceSystem.WKT_PREFERRED_GDAL).replace('"', '"""')
return custom_crs, crs.toWkt(QgsCoordinateReferenceSystem.WKT_PREFERRED_GDAL).replace('"', '\\"')
else:
return custom_crs, proj_def

Expand Down
Expand Up @@ -182,7 +182,7 @@ def testBuffer(self):
['ogr2ogr',
outdir + '/check.shp ' +
source + ' ' +
'-dialect sqlite -sql "SELECT ST_Union(ST_Buffer(geom, 1.0)) AS geom,* FROM """polys2"""" ' +
'-dialect sqlite -sql "SELECT ST_Union(ST_Buffer(geom, 1.0)) AS geom,* FROM \\"polys2\\"" ' +
'-f "ESRI Shapefile"'])

self.assertEqual(
Expand Down

0 comments on commit 015f593

Please sign in to comment.