summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Kholodilov <serghol@gmail.com>2017-03-09 18:12:08 +0400
committerTim Graham <timograham@gmail.com>2017-03-09 09:12:08 -0500
commit993406770ad3dab0728297d7de84d7e394373bd9 (patch)
tree3d3d516ebd2d5cf4463505cc937aeadadc494d95
parentc7351eaa926805917cac64946df323483b1accf0 (diff)
[1.11.x] Fixed Python 2/Windows libgdal crash if PATH contains non-ASCII symbols.
-rw-r--r--django/contrib/gis/gdal/libgdal.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/contrib/gis/gdal/libgdal.py b/django/contrib/gis/gdal/libgdal.py
index 7d7292b7b8..a987b387b2 100644
--- a/django/contrib/gis/gdal/libgdal.py
+++ b/django/contrib/gis/gdal/libgdal.py
@@ -23,7 +23,7 @@ if lib_path:
lib_names = None
elif os.name == 'nt':
# Windows NT shared libraries
- lib_names = ['gdal111', 'gdal110', 'gdal19', 'gdal18', 'gdal17']
+ lib_names = [str('gdal111'), str('gdal110'), str('gdal19'), str('gdal18'), str('gdal17')]
elif os.name == 'posix':
# *NIX library names.
lib_names = ['gdal', 'GDAL', 'gdal1.11.0', 'gdal1.10.0', 'gdal1.9.0', 'gdal1.8.0', 'gdal1.7.0']