Merge branch 'PR-non-ascii-filenames'

xarx00 · xarx00 · commit 4307338be8ef · 2019-04-05T23:43:50.000+02:00
diff --git a/git/compat.py b/git/compat.py
@@ -30,7 +30,10 @@
 is_win = (os.name == 'nt')
 is_posix = (os.name == 'posix')
 is_darwin = (os.name == 'darwin')
-defenc = sys.getdefaultencoding()
+if hasattr(sys, 'getfilesystemencoding'):
+    defenc = sys.getfilesystemencoding()
+if defenc is None:
+    defenc = sys.getdefaultencoding()
 
 if PY3:
     import io
diff --git a/git/repo/base.py b/git/repo/base.py
@@ -4,6 +4,7 @@
 # This module is part of GitPython and is released under
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
 
+from builtins import str
 from collections import namedtuple
 import logging
 import os
