From: Yang Zhao <yang.zhao@skyboxlabs.com>
Date: Fri, 13 Dec 2019 23:52:37 +0000 (-0800)
Subject: git-p4: remove string type aliasing
X-Git-Tag: v2.27.0-rc0~165^2~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1f8b46d0a4fdcb6fea566405cfc5422d39c36d52;p=thirdparty%2Fgit.git

git-p4: remove string type aliasing

Now that python2.7 is the minimum required version and we no longer use
the basestring type, it is not necessary to use type aliasing to ensure
python3 compatibility.

Signed-off-by: Yang Zhao <yang.zhao@skyboxlabs.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-p4.py b/git-p4.py
index 2f177fb43b..153aff16f3 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -26,22 +26,6 @@ import zlib
 import ctypes
 import errno
 
-# support basestring in python3
-try:
-    unicode = unicode
-except NameError:
-    # 'unicode' is undefined, must be Python 3
-    str = str
-    unicode = str
-    bytes = bytes
-    basestring = (str,bytes)
-else:
-    # 'unicode' exists, must be Python 2
-    str = str
-    unicode = unicode
-    bytes = str
-    basestring = basestring
-
 verbose = False
 
 # Only labels/tags matching this will be imported/exported