Merge "Python 3: Replacing unicode with six.text_type for py3 compatibility"

Author: Jenkins

swiftclient/multithreading.py

@@ -102,7 +102,7 @@ def get_error_count(self):
     def _print(self, item, stream=None):
         if stream is None:
             stream = self.print_stream
-        if six.PY2 and isinstance(item, unicode):
+        if six.PY2 and isinstance(item, six.text_type):
             item = item.encode('utf8')
         print(item, file=stream)