summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxarx00 <xarx@sms.cz>2019-04-05 23:42:55 +0200
committerxarx00 <xarx@sms.cz>2019-04-05 23:42:55 +0200
commit3953d71374994a00c7ef756040d2c77090f07bb4 (patch)
tree77fca3f34a3ec4b9bbbc1d48ae638ab557287460
parent1f66e25c25cde2423917ee18c4704fff83b837d1 (diff)
downloadgitpython-3953d71374994a00c7ef756040d2c77090f07bb4.tar.gz
added support for non-ascii directories and file names
-rw-r--r--git/compat.py5
-rw-r--r--git/repo/base.py1
2 files changed, 5 insertions, 1 deletions
diff --git a/git/compat.py b/git/compat.py
index b63768f3..02dc69de 100644
--- a/git/compat.py
+++ b/git/compat.py
@@ -30,7 +30,10 @@ PY3 = sys.version_info[0] >= 3
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
index 58f11e51..993e091d 100644
--- 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