summaryrefslogtreecommitdiff
path: root/git-p4.py
diff options
context:
space:
mode:
authorYang Zhao <yang.zhao@skyboxlabs.com>2019-12-13 23:52:37 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-01-15 20:53:39 (GMT)
commit1f8b46d0a4fdcb6fea566405cfc5422d39c36d52 (patch)
tree6a79f6bb4d67ea95da5af2c2a19c43c64f8c8e34 /git-p4.py
parent484d09c303f271bdbdc2b7ed597e1d8f3959ce0f (diff)
downloadgit-1f8b46d0a4fdcb6fea566405cfc5422d39c36d52.zip
git-1f8b46d0a4fdcb6fea566405cfc5422d39c36d52.tar.gz
git-1f8b46d0a4fdcb6fea566405cfc5422d39c36d52.tar.bz2
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>
Diffstat (limited to 'git-p4.py')
-rwxr-xr-xgit-p4.py16
1 files changed, 0 insertions, 16 deletions
diff --git a/git-p4.py b/git-p4.py
index 2f177fb..153aff1 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