Unicodify bytearrays

galaxyproject · May 30, 2018 · 2ebe887 · 2ebe887
1 parent 7b5e190
commit 2ebe887
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/lib/galaxy/util/__init__.py b/lib/galaxy/util/__init__.py
@@ -938,6 +938,8 @@ def unicodify(value, encoding=DEFAULT_ENCODING, error='replace', default=None):
     True
     >>> unicodify(3) == u'3'
     True
+    >>> unicodify(bytearray([115, 116, 114, 196, 169, 195, 177, 103])) == u'strĩñg'
+    True
     >>> unicodify(Exception('message')) == u'message'
     True
     >>> unicodify('cómplǐcḁtëd strĩñg') == u'cómplǐcḁtëd strĩñg'
@@ -952,7 +954,9 @@ def unicodify(value, encoding=DEFAULT_ENCODING, error='replace', default=None):
     if value is None:
         return None
     try:
-        if not isinstance(value, string_types) and not isinstance(value, binary_type):
+        if isinstance(value, bytearray):
+            value = bytes(value)
+        elif not isinstance(value, string_types) and not isinstance(value, binary_type):
             # In Python 2, value is not an instance of basestring
             # In Python 3, value is not an instance of bytes or str
             value = str(value)