Merge branch 'PR-non-ascii-filenames' of https://github.com/xarx00/GitPython into xarx00-PR-non-ascii-filenames

Sebastian Thiel · Sebastian Thiel · commit 3b13c1159944 · 2019-07-20T15:22:32.000+08: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
diff --git a/requirements.txt b/requirements.txt
@@ -1 +1,4 @@
 gitdb2 (>=2.0.0)
+gitdb>=0.6.4
+ddt>=1.1.1
+future>=0.9
