py2: Update asString to convert derived types to bytes (#106)

justinfx · Sep 7, 2021 · 0776735 · 0776735
1 parent 798c602
commit 0776735
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/fileseq/utils.py b/src/fileseq/utils.py
@@ -321,7 +321,9 @@ def asString(obj):
         return obj
     # derived type check
     elif isinstance(obj, bytes):
-        if not futils.PY2:
+        if futils.PY2:
+            obj = bytes(obj)
+        else:
             obj = obj.decode(FILESYSTEM_ENCODING)
     else:
         obj = futils.text_type(obj)

diff --git a/test/test_unit.py b/test/test_unit.py
@@ -112,6 +112,17 @@ def testXrange(self):
             self.assertEqual(len(expected), len(actual))
             self.assertEqual(expected, list(actual))
 
+    def testAsString(self):
+        expect = "my string"
+        custom = _CustomPathString(expect)
+        self.assertEqual(expect, custom)
+
+        # https://github.com/justinfx/fileseq/issues/106
+        actual = utils.asString(custom)
+        self.assertEqual(expect, actual)
+        self.assertIsInstance(actual, str)
+        self.assertNotIsInstance(actual, _CustomPathString)
+
 
 class TestFrameSet(unittest.TestCase):