diff options
| author | Sebastian Thiel <sthiel@thoughtworks.com> | 2019-07-20 15:32:05 +0800 |
|---|---|---|
| committer | Sebastian Thiel <sthiel@thoughtworks.com> | 2019-07-20 15:32:05 +0800 |
| commit | cc664f07535e3b3c1884d0b7f3cbcbadf9adce25 (patch) | |
| tree | a90722893f1dea42e55faa1a6e91d7c6a171ba15 | |
| parent | 3b13c115994461fb6bafe5dd06490aae020568c1 (diff) | |
| download | gitpython-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
| -rw-r--r-- | git/compat.py | 5 | ||||
| -rw-r--r-- | git/repo/base.py | 1 | ||||
| -rw-r--r-- | requirements.txt | 3 |
3 files changed, 1 insertions, 8 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 diff --git a/git/repo/base.py b/git/repo/base.py index 911494ad..f3587080 100644 --- a/git/repo/base.py +++ b/git/repo/base.py @@ -4,7 +4,6 @@ # 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 index eacd5f54..63d5ddfe 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1 @@ gitdb2 (>=2.0.0) -gitdb>=0.6.4 -ddt>=1.1.1 -future>=0.9 |