Skip to content

Commit

Permalink
git-p4: remove string type aliasing
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
yangskyboxlabs authored and gitster committed Jan 15, 2020
1 parent 484d09c commit 1f8b46d
Showing 1 changed file with 0 additions and 16 deletions.
16 changes: 0 additions & 16 deletions git-p4.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 1f8b46d

Please sign in to comment.