From 589dc49e129f63801c54c15e408c944a345b3dfe Mon Sep 17 00:00:00 2001 From: Aymeric Augustin Date: Sun, 13 Oct 2013 18:06:58 +0200 Subject: Fixed #21198 -- Prevented invalid use of @python_2_unicode_compatible. Thanks jpic for the report and chmodas for working on a patch. Reverts 2ea80b94. Refs #19362. --- tests/utils_tests/test_encoding.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'tests/utils_tests/test_encoding.py') diff --git a/tests/utils_tests/test_encoding.py b/tests/utils_tests/test_encoding.py index 81a4c4f5da..a91f5965db 100644 --- a/tests/utils_tests/test_encoding.py +++ b/tests/utils_tests/test_encoding.py @@ -5,7 +5,8 @@ import unittest import datetime from django.utils import six -from django.utils.encoding import force_bytes, force_text, filepath_to_uri +from django.utils.encoding import (force_bytes, force_text, filepath_to_uri, + python_2_unicode_compatible) class TestEncodingUtils(unittest.TestCase): @@ -43,3 +44,10 @@ class TestEncodingUtils(unittest.TestCase): 'upload/%D1%87%D1%83%D0%B1%D0%B0%D0%BA%D0%B0.mp4') self.assertEqual(filepath_to_uri('upload\\чубака.mp4'.encode('utf-8')), 'upload/%D1%87%D1%83%D0%B1%D0%B0%D0%BA%D0%B0.mp4') + + @unittest.skipIf(six.PY3, "tests a class not defining __str__ under Python 2") + def test_decorated_class_without_str(self): + with self.assertRaises(ValueError): + @python_2_unicode_compatible + class NoStr(object): + pass -- cgit v1.3