From deec020bf5927abbdd667912f80794c32c03e609 Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Fri, 22 Mar 2013 17:55:12 +0100 Subject: [1.5.x] Fixed #20108 -- Fixed filepath_to_uri decoding error This was a regression due to unicode_literals usage. Thanks Ivan Virabyan for the report and the initial patch. Backport of 164528acc8 from master. --- tests/regressiontests/utils/encoding.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'tests/regressiontests/utils/encoding.py') diff --git a/tests/regressiontests/utils/encoding.py b/tests/regressiontests/utils/encoding.py index d191845518..7aaba25a7a 100644 --- a/tests/regressiontests/utils/encoding.py +++ b/tests/regressiontests/utils/encoding.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals from django.utils import unittest -from django.utils.encoding import force_bytes +from django.utils.encoding import force_bytes, filepath_to_uri class TestEncodingUtils(unittest.TestCase): @@ -15,3 +15,9 @@ class TestEncodingUtils(unittest.TestCase): exc = ValueError(error_msg) result = force_bytes(exc) self.assertEqual(result, error_msg.encode('utf-8')) + + def test_filepath_to_uri(self): + self.assertEqual(filepath_to_uri('upload\\чубака.mp4'), + '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') -- cgit v1.3