mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-26 07:06:08 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #21198 -- Prevented invalid use of @python_2_unicode_compatible.

Browse Source 
Thanks jpic for the report and chmodas for working on a patch.

Reverts 2ea80b94. Refs #19362.

Conflicts:
	tests/utils_tests/test_encoding.py
This commit is contained in:
Aymeric Augustin
2013-10-13 18:06:58 +02:00
parent ddff6522fa
commit f0c7649b16
6 changed files with 14 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/utils_tests/test_encoding.py
View File

@@ -2,7 +2,8 @@
from __future__ import unicode_literals
from django.utils import unittest
from django.utils.encoding import force_bytes, filepath_to_uri
from django.utils.encoding import force_bytes, filepath_to_uri, python_2_unicode_compatible
from django.utils import six
class TestEncodingUtils(unittest.TestCase):
@@ -21,3 +22,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