summaryrefslogtreecommitdiff
path: root/git/compat.py
diff options
context:
space:
mode:
authorSebastian Thiel <sthiel@thoughtworks.com>2019-07-20 15:32:05 +0800
committerSebastian Thiel <sthiel@thoughtworks.com>2019-07-20 15:32:05 +0800
commitcc664f07535e3b3c1884d0b7f3cbcbadf9adce25 (patch)
treea90722893f1dea42e55faa1a6e91d7c6a171ba15 /git/compat.py
parent3b13c115994461fb6bafe5dd06490aae020568c1 (diff)
downloadgitpython-cc664f07535e3b3c1884d0b7f3cbcbadf9adce25.tar.gz
Revert "Merge branch 'PR-non-ascii-filenames' of https://github.com/xarx00/GitPython into xarx00-PR-non-ascii-filenames"
This reverts commit 3b13c115994461fb6bafe5dd06490aae020568c1, reversing changes made to da8aeec539da461b2961ca72049df84bf30473e1. It doesn't pass, unfortunately. Is it a travis issue? https://travis-ci.org/gitpython-developers/GitPython/jobs/561333763#L340
Diffstat (limited to 'git/compat.py')
-rw-r--r--git/compat.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/git/compat.py b/git/compat.py
index 02dc69de..b63768f3 100644
--- a/git/compat.py
+++ b/git/compat.py
@@ -30,10 +30,7 @@ PY3 = sys.version_info[0] >= 3
is_win = (os.name == 'nt')
is_posix = (os.name == 'posix')
is_darwin = (os.name == 'darwin')
-if hasattr(sys, 'getfilesystemencoding'):
- defenc = sys.getfilesystemencoding()
-if defenc is None:
- defenc = sys.getdefaultencoding()
+defenc = sys.getdefaultencoding()
if PY3:
import io