Refs #22426 -- Removed pre-Django 1.5 messages compatibility code and test.
This reverts commit f286721f7f
.
This commit is contained in:
parent
a97111eabf
commit
e7d62e97eb
|
@ -32,9 +32,6 @@ class MessageDecoder(json.JSONDecoder):
|
||||||
def process_messages(self, obj):
|
def process_messages(self, obj):
|
||||||
if isinstance(obj, list) and obj:
|
if isinstance(obj, list) and obj:
|
||||||
if obj[0] == MessageEncoder.message_key:
|
if obj[0] == MessageEncoder.message_key:
|
||||||
if len(obj) == 3:
|
|
||||||
# Compatibility with previously-encoded messages
|
|
||||||
return Message(*obj[1:])
|
|
||||||
if obj[1]:
|
if obj[1]:
|
||||||
obj[3] = mark_safe(obj[3])
|
obj[3] = mark_safe(obj[3])
|
||||||
return Message(*obj[2:])
|
return Message(*obj[2:])
|
||||||
|
|
|
@ -153,24 +153,3 @@ class CookieTests(BaseTests, SimpleTestCase):
|
||||||
storage = self.get_storage()
|
storage = self.get_storage()
|
||||||
self.assertIsInstance(encode_decode(mark_safe("<b>Hello Django!</b>")), SafeData)
|
self.assertIsInstance(encode_decode(mark_safe("<b>Hello Django!</b>")), SafeData)
|
||||||
self.assertNotIsInstance(encode_decode("<b>Hello Django!</b>"), SafeData)
|
self.assertNotIsInstance(encode_decode("<b>Hello Django!</b>"), SafeData)
|
||||||
|
|
||||||
def test_pre_1_5_message_format(self):
|
|
||||||
"""
|
|
||||||
Messages that were set in the cookie before the addition of is_safedata
|
|
||||||
are decoded correctly (#22426).
|
|
||||||
"""
|
|
||||||
# Encode the messages using the current encoder.
|
|
||||||
messages = [Message(constants.INFO, 'message %s') for x in range(5)]
|
|
||||||
encoder = MessageEncoder(separators=(',', ':'))
|
|
||||||
encoded_messages = encoder.encode(messages)
|
|
||||||
|
|
||||||
# Remove the is_safedata flag from the messages in order to imitate
|
|
||||||
# the behavior of before 1.5 (monkey patching).
|
|
||||||
encoded_messages = json.loads(encoded_messages)
|
|
||||||
for obj in encoded_messages:
|
|
||||||
obj.pop(1)
|
|
||||||
encoded_messages = json.dumps(encoded_messages, separators=(',', ':'))
|
|
||||||
|
|
||||||
# Decode the messages in the old format (without is_safedata)
|
|
||||||
decoded_messages = json.loads(encoded_messages, cls=MessageDecoder)
|
|
||||||
self.assertEqual(messages, decoded_messages)
|
|
||||||
|
|
Loading…
Reference in New Issue