]> granicus.if.org Git - python/commitdiff
Issue #23911: Fix mixed bytes/strings.
authorEric Snow <ericsnowcurrently@gmail.com>
Mon, 4 May 2015 17:48:39 +0000 (11:48 -0600)
committerEric Snow <ericsnowcurrently@gmail.com>
Mon, 4 May 2015 17:48:39 +0000 (11:48 -0600)
Lib/test/test_site.py

index 9a99dfaf3d8782b5acb62bcca4a80cba6740bc55..6615080c46ebbbce2682591816038043cdc40b76 100644 (file)
@@ -356,9 +356,11 @@ class ImportSideEffectTests(unittest.TestCase):
         self.assertEqual(proc.returncode, 0)
         os__file__, os__cached__ = stdout.splitlines()[:2]
         self.assertTrue(os.path.isabs(os__file__),
-                        "expected absolute path, got {}".format(os__file__))
+                        "expected absolute path, got {}"
+                        .format(os__file__.decode('ascii')))
         self.assertTrue(os.path.isabs(os__cached__),
-                        "expected absolute path, got {}".format(os__cached__))
+                        "expected absolute path, got {}"
+                        .format(os__cached__.decode('ascii')))
 
     def test_no_duplicate_paths(self):
         # No duplicate paths should exist in sys.path