diff options
author | Sebastian Thiel <sthiel@thoughtworks.com> | 2019-07-29 07:57:46 +0800 |
---|---|---|
committer | Sebastian Thiel <sthiel@thoughtworks.com> | 2019-07-29 07:57:46 +0800 |
commit | 913d806f02cf50250d230f88b897350581f80f6b (patch) | |
tree | 734deb5048687341e64f68b4162af81c829458bf /git | |
parent | ce7e1507fa5f6faf049794d4d47b14157d1f2e50 (diff) | |
download | gitpython-913d806f02cf50250d230f88b897350581f80f6b.tar.gz |
Revert "Drop python 2.7 support and help with encodings"
This reverts commit dac619e4917b0ad43d836a534633d68a871aecca.
Diffstat (limited to 'git')
-rw-r--r-- | git/compat.py | 5 | ||||
-rw-r--r-- | git/repo/base.py | 1 |
2 files changed, 1 insertions, 5 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 |