Remove and replace compat.unicode

Author: Harmon758

git/cmd.py

@@ -25,8 +25,6 @@
     defenc,
     force_bytes,
     PY3,
-    # just to satisfy flake8 on py3
-    unicode,
     safe_decode,
     is_posix,
     is_win,
@@ -920,15 +918,15 @@ def __unpack_args(cls, arg_list):
         if not isinstance(arg_list, (list, tuple)):
             # This is just required for unicode conversion, as subprocess can't handle it
             # However, in any other case, passing strings (usually utf-8 encoded) is totally fine
-            if not PY3 and isinstance(arg_list, unicode):
+            if not PY3 and isinstance(arg_list, str):
                 return [arg_list.encode(defenc)]
             return [str(arg_list)]
 
         outlist = []
         for arg in arg_list:
             if isinstance(arg_list, (list, tuple)):
                 outlist.extend(cls.__unpack_args(arg))
-            elif not PY3 and isinstance(arg_list, unicode):
+            elif not PY3 and isinstance(arg_list, str):
                 outlist.append(arg_list.encode(defenc))
             # END recursion
             else:

git/compat.py

@@ -32,18 +32,16 @@
 defenc = sys.getfilesystemencoding()
 
 if PY3:
-    unicode = str
     binary_type = bytes
 else:
     if defenc == 'ascii':
         defenc = 'utf-8'
-    unicode = unicode
     binary_type = str
 
 
 def safe_decode(s):
     """Safely decodes a binary string to unicode"""
-    if isinstance(s, unicode):
+    if isinstance(s, str):
         return s
     elif isinstance(s, bytes):
         return s.decode(defenc, 'surrogateescape')
@@ -53,7 +51,7 @@ def safe_decode(s):
 
 def safe_encode(s):
     """Safely decodes a binary string to unicode"""
-    if isinstance(s, unicode):
+    if isinstance(s, str):
         return s.encode(defenc)
     elif isinstance(s, bytes):
         return s
@@ -63,7 +61,7 @@ def safe_encode(s):
 
 def win_encode(s):
     """Encode unicodes for process arguments on Windows."""
-    if isinstance(s, unicode):
+    if isinstance(s, str):
         return s.encode(locale.getpreferredencoding(False))
     elif isinstance(s, bytes):
         return s