Commit 03d89168 authored by Ian Foote's avatar Ian Foote Committed by Tim Graham
Browse files

Fixed #23333 -- Made urlsafe_base64_decode() return proper type on Python 3.

parent f9c7732e

django/utils/http.py

+2 −2
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ from binascii import Error as BinasciiError 
from email.utils import formatdate



from django.utils.datastructures import MultiValueDict

from django.utils.encoding import force_str, force_text

from django.utils.encoding import force_bytes, force_str, force_text

from django.utils.functional import allow_lazy

from django.utils import six

from django.utils.six.moves.urllib.parse import (
@@ -227,7 +227,7 @@ def urlsafe_base64_decode(s): 
    Decodes a base64 encoded string, adding back any trailing equal signs that

    might have been stripped.

    """

    s = s.encode('utf-8')  # base64encode should only return ASCII.

    s = force_bytes(s)

    try:

        return base64.urlsafe_b64decode(s.ljust(len(s) + len(s) % 4, b'='))

    except (LookupError, BinasciiError) as e:

tests/utils_tests/test_http.py

+6 −0
Original line number Diff line number Diff line
@@ -119,6 +119,12 @@ class TestUtilsHttp(unittest.TestCase): 
                     '/url%20with%20spaces/'):

            self.assertTrue(http.is_safe_url(good_url, host='testserver'), "%s should be allowed" % good_url)



    def test_urlsafe_base64_roundtrip(self):

        bytestring = b'foo'

        encoded = http.urlsafe_base64_encode(bytestring)

        decoded = http.urlsafe_base64_decode(encoded)

        self.assertEqual(bytestring, decoded)





class ETagProcessingTests(unittest.TestCase):

    def test_parsing(self):