callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

openraster: filesystem encoding could return None - defaults to utf-8

Browse Source
This commit is contained in:
João S. O. Bueno
2015-02-22 12:47:47 -03:00
parent 78df196f12
commit f4a24478bd
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
plug-ins/pygimp/plug-ins/file-openraster.py
View File

@ -101,8 +101,9 @@ def save_ora(img, drawable, filename, raw_filename):
# 1 - 1 correspondence between raw_bytes and UCS-2 used by Python # 1 - 1 correspondence between raw_bytes and UCS-2 used by Python
# Unicode characters # Unicode characters
filename = filename.decode("latin1") filename = filename.decode("latin1")
filename = filename.encode(sys.getfilesystemencoding()) encoding = sys.getfilesystemencoding() or "utf-8"
tmp_sufix = ".tmpsave".encode(sys.getfilesystemencoding()) filename = filename.encode(encoding)
tmp_sufix = ".tmpsave".encode(encoding)
# use .tmpsave extension, so we don't overwrite a valid file if # use .tmpsave extension, so we don't overwrite a valid file if
# there is an exception # there is an exception
orafile = zipfile.ZipFile(filename + tmp_sufix, 'w', compression=zipfile.ZIP_STORED) orafile = zipfile.ZipFile(filename + tmp_sufix, 'w', compression=zipfile.ZIP_STORED)
@ -176,7 +177,7 @@ def load_ora(filename, raw_filename):
try: try:
if not isinstance(filename, str): if not isinstance(filename, str):
filename = filename.decode("utf-8") filename = filename.decode("utf-8")
orafile = zipfile.ZipFile(filename.encode(sys.getfilesystemencoding())) orafile = zipfile.ZipFile(filename.encode(sys.getfilesystemencoding() or "utf-8"))
except (UnicodeDecodeError, IOError): except (UnicodeDecodeError, IOError):
# Someone may try to open an actually garbled name, and pass a raw # Someone may try to open an actually garbled name, and pass a raw
# non-utf 8 filename: # non-utf 8 filename: