[gimp/gimp-2-8] openraster: filesystem encoding could return None - defaults to utf-8

[João Sebastião de Oliveira Bueno Calligaris <jsbueno src gnome org>]

commit 1601c9123fb1c8488c524755171c07336a6848b6
Author: João S. O. Bueno <gwidion gmail com>
Date:   Sun Feb 22 12:47:47 2015 -0300

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

 plug-ins/pygimp/plug-ins/file-openraster.py |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/plug-ins/pygimp/plug-ins/file-openraster.py b/plug-ins/pygimp/plug-ins/file-openraster.py
index 85da782..e793bfd 100755
--- a/plug-ins/pygimp/plug-ins/file-openraster.py
+++ b/plug-ins/pygimp/plug-ins/file-openraster.py
@@ -101,8 +101,9 @@ def save_ora(img, drawable, filename, raw_filename):
             # 1 - 1 correspondence between raw_bytes and UCS-2 used by Python
             # Unicode characters
             filename = filename.decode("latin1")
-    filename = filename.encode(sys.getfilesystemencoding())
-    tmp_sufix = ".tmpsave".encode(sys.getfilesystemencoding())
+    encoding = sys.getfilesystemencoding() or "utf-8"
+    filename = filename.encode(encoding)
+    tmp_sufix = ".tmpsave".encode(encoding)
     # use .tmpsave extension, so we don't overwrite a valid file if
     # there is an exception
     orafile = zipfile.ZipFile(filename + tmp_sufix, 'w', compression=zipfile.ZIP_STORED)
@@ -176,7 +177,7 @@ def load_ora(filename, raw_filename):
     try:
         if not isinstance(filename, str):
             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):
         # Someone may try to open an actually garbled name, and pass a raw
         # non-utf 8 filename: