Context Navigation

Ticket #28121: 28121_1_8.patch

File 28121_1_8.patch, 1.7 KB (added by Thomas Achtemichuk, 8 years ago)
Test and patch for 1.8

diff --git a/django/utils/encoding.py b/django/utils/encoding.py
index 99c9da843a..efb2868563 100644

                from decimal import Decimal
 from django.utils import six
 from django.utils.functional import Promise
+from django.utils.safestring import SafeBytes
 from django.utils.six.moves.urllib.parse import quote, unquote
 if six.PY3:
-…
+               def force_text(s, encoding='utf-8', strings_only=False, errors='strict'):
     if strings_only and is_protected_type(s):
         return s
     try:
         if not isinstance(s, six.string_types):
+        if not isinstance(s, six.string_types + (SafeBytes,)):
             if six.PY3:
                 if isinstance(s, bytes):
                     s = six.text_type(s, encoding, errors)

diff --git a/tests/utils_tests/test_encoding.py b/tests/utils_tests/test_encoding.py
index e581003d9a..b6a9305f6f 100644

                from django.utils.encoding import (
     uri_to_iri,
+)
 from django.utils.http import urlquote_plus
+from django.utils.safestring import SafeBytes, SafeText
 class TestEncodingUtils(unittest.TestCase):
-…
+               class TestEncodingUtils(unittest.TestCase):
         today = datetime.date.today()
         self.assertEqual(force_bytes(today, strings_only=True), today)
+    def test_force_text_safe_bytes(self):
+        s = SafeBytes(b'')
+        self.assertIsInstance(force_text(s), SafeText)
     def test_escape_uri_path(self):
         self.assertEqual(
             escape_uri_path('/;some/=awful/?path/:with/@lots/&of/+awful/chars'),