From 913d806f02cf50250d230f88b897350581f80f6b Mon Sep 17 00:00:00 2001
From: Sebastian Thiel <sthiel@thoughtworks.com>
Date: Mon, 29 Jul 2019 07:57:46 +0800
Subject: Revert "Drop python 2.7 support and help with encodings"

This reverts commit dac619e4917b0ad43d836a534633d68a871aecca.
---
 git/compat.py    | 5 +----
 git/repo/base.py | 1 -
 2 files changed, 1 insertion(+), 5 deletions(-)

(limited to 'git')

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
-- 
cgit v1.2.3