commit 35b6b4b6f318210ca099e9b31fc23dad2419aaeb
author Mike Frysinger <vapier@chromium.org> Tue Jan 19 18:29:47 2021 -0500
committer Commit Bot <commit-bot@chromium.org> Wed Jan 20 22:39:25 2021 +0000
tree 1d91684032cf3641f2711a66b3f3e6b9f2aab2bf
parent 78c6bc56ba7921a3b52a34486dd54f8e8d065182

gs: fix unicode handling w/python2

Doesn't seem like this has been a problem in practice, but might
as well fix it as long as the module claims to support python 2.

BUG=None
TEST=gs_unittest --network passes under py2

Change-Id: I20d48e93a7fdd97d89608cbb6f36ece8c57edf0b
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2637066
Tested-by: Mike Frysinger <vapier@chromium.org>
Auto-Submit: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Chris McDonald <cjmcdonald@chromium.org>
Reviewed-by: Chris McDonald <cjmcdonald@chromium.org>

lib/gs.py

diff --git a/lib/gs.py b/lib/gs.py
index f5b8547..18a11c4 100644
--- a/lib/gs.py
+++ b/lib/gs.py
@@ -1036,7 +1036,7 @@
     if details:
       cmd += ['-l']
     cmd += ['--']
-    if isinstance(path, str):
+    if isinstance(path, six.string_types):
       cmd.append(path)
     else:
       cmd.extend(path)
@@ -1109,7 +1109,7 @@
       acl = self.acl
 
     cmd = ['acl', 'set', '--', acl]
-    if isinstance(path, str):
+    if isinstance(path, six.string_types):
       cmd.append(path)
     else:
       cmd.extend(path)
@@ -1187,7 +1187,7 @@
     if recursive:
       cmd.append('-R')
     cmd.append('--')
-    if isinstance(path, str):
+    if isinstance(path, six.string_types):
       cmd.append(path)
     else:
       cmd.extend(path)