From: Eric Snow <ericsnowcurrently@gmail.com>
Date: Mon, 4 May 2015 17:48:39 +0000 (-0600)
Subject: Issue #23911: Fix mixed bytes/strings.
X-Git-Tag: v3.5.0b1~245
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=00607e91bdcd612195610db87edcf1c4bff4d27f;p=python

Issue #23911: Fix mixed bytes/strings.
---

diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py
index 9a99dfaf3d..6615080c46 100644
--- a/Lib/test/test_site.py
+++ b/Lib/test/test_site.py
@@ -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