Refs #27795 -- Removed force_bytes() usage in utils/_os.py.

1 files changed, 6 insertions, 13 deletions

diff --git a/tests/template_tests/test_loaders.py b/tests/template_tests/test_loaders.py
index 5c81164bb5..ea69472264 100644
--- a/tests/template_tests/test_loaders.py
+++ b/tests/template_tests/test_loaders.py
@@ -156,24 +156,17 @@ class FileSystemLoaderTests(SimpleTestCase):
 
     def test_unicode_template_name(self):
         with self.source_checker(['/dir1', '/dir2']) as check_sources:
-            # UTF-8 bytestrings are permitted.
-            check_sources(b'\xc3\x85ngstr\xc3\xb6m', ['/dir1/Ångström', '/dir2/Ångström'])
-            # Strings are permitted.
             check_sources('Ångström', ['/dir1/Ångström', '/dir2/Ångström'])
 
-    def test_utf8_bytestring(self):
-        """
-        Invalid UTF-8 encoding in bytestrings should raise a useful error
-        """
-        engine = self.engine
-        loader = engine.template_loaders[0]
-        with self.assertRaises(UnicodeDecodeError):
-            list(loader.get_template_sources(b'\xc3\xc3'))
+    def test_bytestring(self):
+        loader = self.engine.template_loaders[0]
+        msg = "Can't mix strings and bytes in path components"
+        with self.assertRaisesMessage(TypeError, msg):
+            list(loader.get_template_sources(b'\xc3\x85ngstr\xc3\xb6m'))
 
     def test_unicode_dir_name(self):
-        with self.source_checker([b'/Stra\xc3\x9fe']) as check_sources:
+        with self.source_checker(['/Straße']) as check_sources:
             check_sources('Ångström', ['/Straße/Ångström'])
-            check_sources(b'\xc3\x85ngstr\xc3\xb6m', ['/Straße/Ångström'])
 
     @unittest.skipUnless(
         os.path.normcase('/TEST') == os.path.normpath('/test'),