From c9dbaab311dbafcba0b68edb6ed89988b476f1dc Mon Sep 17 00:00:00 2001
From: Sebastian Thiel <sthiel@thoughtworks.com>
Date: Sat, 20 Jul 2019 15:37:53 +0800
Subject: Revert "This time, use test-requirements."

This reverts commit 74a0507f4eb468b842d1f644f0e43196cda290a1.

https://travis-ci.org/gitpython-developers/GitPython/jobs/561334516#L634
---
 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