[PATCH 4/6] git-p4: python3: basestring workaround

From: Luke Diamand <luke@diamand.org>
Date: Jun 19, 2018, 08:04 UTC
Message-ID: <20180619080411.6554-5-luke@diamand.org>
In-Reply-To: <20180619080411.6554-4-luke@diamand.org>

In Python3, basestring no longer exists, so use this workaround.

Signed-off-by: Luke Diamand <luke@diamand.org>
---
 git-p4.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/git-p4.py b/git-p4.py
index 67865d14aa..f127ebce27 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -27,6 +27,22 @@
 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
+
 try:
     from subprocess import CalledProcessError
 except ImportError:

-- 
2.18.0.rc1.242.g61856ae69a