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

[1.7.x] Fixed #23333 -- Made urlsafe_base64_decode() return proper type on Python 3.

Backport of 03d89168 from master
parent b2f7b517
Loading
Loading
Loading
Loading
+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 (
@@ -224,7 +224,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:
+3 −0
Original line number Diff line number Diff line
@@ -103,3 +103,6 @@ Bugfixes

* Fixed missing ``get_or_create`` and ``update_or_create`` on related managers
  causing ``IntegrityError`` (:ticket:`23611`).

* Made :func:`~django.utils.http.urlsafe_base64_decode` return the proper
  type (byte string) on Python 3 (:ticket:`23333`).
+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):