mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
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>
This commit is contained in:
parent
484d09c303
commit
1f8b46d0a4
16
git-p4.py
16
git-p4.py
|
@ -26,22 +26,6 @@
|
|||
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
|
||||
|
|
Loading…
Reference in a new issue