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>
Yang Zhao committed
Dec 13, 2019 at 15:52 UTC
1f8b46d0a4fdcb6fea566405cfc5422d39c36d52
1 file changed
-16
git-p4.py
-16
@@ -26,22 +26,6 @@ import zlib
26
import ctypes
27
import errno
28
29
-# support basestring in python3
30
-try:
31
- unicode = unicode
32
-except NameError:
33
- # 'unicode' is undefined, must be Python 3
34
- str = str
35
- unicode = str
36
- bytes = bytes
37
- basestring = (str,bytes)
38
-else:
39
- # 'unicode' exists, must be Python 2
40
- str = str
41
- unicode = unicode
42
- bytes = str
43
- basestring = basestring
44
-
29
verbose = False
30
31
# Only labels/tags matching this will be imported/exported