From abd939f16d74f08745376fdd3f98629e2e94f599 Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@mit.edu>
Date: Sun, 1 Nov 2015 08:14:25 -0800
Subject: [PATCH] Apply Python 3 futurize transform
 libmodernize.fixes.fix_basestring.

---
 integrations/perforce/git_p4.py | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/integrations/perforce/git_p4.py b/integrations/perforce/git_p4.py
index f65d4fe..5b1aacf 100644
--- a/integrations/perforce/git_p4.py
+++ b/integrations/perforce/git_p4.py
@@ -8,7 +8,9 @@
 # License: MIT <http://www.opensource.org/licenses/mit-license.php>
 #
 from __future__ import print_function
+from __future__ import absolute_import
 import sys
+import six
 if sys.hexversion < 0x02040000:
     # The limiter is the subprocess module
     sys.stderr.write("git-p4: requires Python 2.4 or later.\n")
@@ -53,7 +55,7 @@ def p4_build_cmd(cmd):
     """
     real_cmd = ["p4"]
 
-    if isinstance(cmd, basestring):
+    if isinstance(cmd, six.string_types):
         real_cmd = ' '.join(real_cmd) + ' ' + cmd
     else:
         real_cmd += cmd
@@ -92,7 +94,7 @@ def write_pipe(c, stdin):
     if verbose:
         sys.stderr.write('Writing pipe: %s\n' % str(c))
 
-    expand = isinstance(c, basestring)
+    expand = isinstance(c, six.string_types)
     p = subprocess.Popen(c, stdin=subprocess.PIPE, shell=expand)
     pipe = p.stdin
     val = pipe.write(stdin)
@@ -110,7 +112,7 @@ def read_pipe(c, ignore_error=False):
     if verbose:
         sys.stderr.write('Reading pipe: %s\n' % str(c))
 
-    expand = isinstance(c, basestring)
+    expand = isinstance(c, six.string_types)
     p = subprocess.Popen(c, stdout=subprocess.PIPE, shell=expand)
     pipe = p.stdout
     val = pipe.read()
@@ -127,7 +129,7 @@ def read_pipe_lines(c):
     if verbose:
         sys.stderr.write('Reading pipe: %s\n' % str(c))
 
-    expand = isinstance(c, basestring)
+    expand = isinstance(c, six.string_types)
     p = subprocess.Popen(c, stdout=subprocess.PIPE, shell=expand)
     pipe = p.stdout
     val = pipe.readlines()
@@ -170,7 +172,7 @@ def p4_has_move_command():
     return True
 
 def system(cmd):
-    expand = isinstance(cmd, basestring)
+    expand = isinstance(cmd, six.string_types)
     if verbose:
         sys.stderr.write("executing %s\n" % str(cmd))
     retcode = subprocess.call(cmd, shell=expand)
@@ -180,7 +182,7 @@ def system(cmd):
 def p4_system(cmd):
     """Specifically invoke p4 as the system command. """
     real_cmd = p4_build_cmd(cmd)
-    expand = isinstance(real_cmd, basestring)
+    expand = isinstance(real_cmd, six.string_types)
     retcode = subprocess.call(real_cmd, shell=expand)
     if retcode:
         raise CalledProcessError(retcode, real_cmd)
@@ -357,7 +359,7 @@ def getP4OpenedType(file):
 # Return the set of all p4 labels
 def getP4Labels(depotPaths):
     labels = set()
-    if isinstance(depotPaths, basestring):
+    if isinstance(depotPaths, six.string_types):
         depotPaths = [depotPaths]
 
     for l in p4CmdList(["labels"] + ["%s..." % p for p in depotPaths]):
@@ -424,7 +426,7 @@ def isModeExecChanged(src_mode, dst_mode):
 
 def p4CmdList(cmd, stdin=None, stdin_mode='w+b', cb=None):
 
-    if isinstance(cmd, basestring):
+    if isinstance(cmd, six.string_types):
         cmd = "-G " + cmd
         expand = True
     else:
@@ -441,7 +443,7 @@ def p4CmdList(cmd, stdin=None, stdin_mode='w+b', cb=None):
     stdin_file = None
     if stdin is not None:
         stdin_file = tempfile.TemporaryFile(prefix='p4-stdin', mode=stdin_mode)
-        if isinstance(stdin, basestring):
+        if isinstance(stdin, six.string_types):
             stdin_file.write(stdin)
         else:
             for i in stdin: