Merge pull request #2678 from rodrigc/asciifix

Fix buildbot.test.unit.test_util.CommandToString.test_invalid_ascii on Python 3

master/buildbot/test/unit/test_util.py

@@ -435,7 +435,7 @@ def test_list_with_objects(self):
                          u"'ab cd'")
 
     def test_invalid_ascii(self):
-        self.assertEqual(util.command_to_string('a\xffc'), u"'a\ufffdc'")
+        self.assertEqual(util.command_to_string(b'a\xffc'), u"'a\ufffdc'")
 
 
 class TestRewrap(unittest.TestCase):

master/buildbot/util/__init__.py

@@ -419,7 +419,7 @@ def join_list(maybeList):
 
 def command_to_string(command):
     words = command
-    if isinstance(words, string_types):
+    if isinstance(words, (bytes, string_types)):
         words = words.split()
 
     try:
@@ -435,7 +435,14 @@ def command_to_string(command):
 
     # strip instances and other detritus (which can happen if a
     # description is requested before rendering)
-    words = [w for w in words if isinstance(w, (string_types))]
+    stringWords = []
+    for w in words:
+        if isinstance(w, (bytes, string_types)):
+            # If command was bytes, be gentle in
+            # trying to covert it.
+            w = ascii2unicode(w, "replace")
+            stringWords.append(w)
+    words = stringWords
 
     if len(words) < 1:
         return None
@@ -444,11 +451,6 @@ def command_to_string(command):
     else:
         rv = "'%s ...'" % (' '.join(words[:2]))
 
-    # cmd was a command and thus probably a bytestring.  Be gentle in
-    # trying to covert it.
-    if isinstance(rv, bytes):
-        rv = rv.decode('ascii', 'replace')
-
     return rv