Ticket #10183: django.test.testcases_assertContainsPatch.2.diff

django/test/testcases.py

@@ -12 +12 @@
 from django.test import _doctest as doctest
 from django.test.client import Client
 from django.utils import simplejson
+from django.utils.encoding import smart_str
 
 normalize_long_ints = lambda s: re.sub(r'(?<![\w])(\d+)L(?![\w])', '\\1', s)
 normalize_decimals = lambda s: re.sub(r"Decimal\('(\d+(\.\d*)?)'\)", lambda m: "Decimal(\"%s\")" % m.groups()[0], s)
@@ -307 +308 @@
         self.assertEqual(response.status_code, status_code,
             "Couldn't retrieve page: Response code was %d (expected %d)'" %
                 (response.status_code, status_code))
-        real_count = response.content.count(text)
+        real_count = response.content.count(smart_str(text, response._charset))
         if count is not None:
             self.assertEqual(real_count, count,
                 "Found %d instances of '%s' in response (expected %d)" %
@@ -325 +326 @@
         self.assertEqual(response.status_code, status_code,
             "Couldn't retrieve page: Response code was %d (expected %d)'" %
                 (response.status_code, status_code))
-        self.assertEqual(response.content.count(text), 0,
-                         "Response should not contain '%s'" % text)
+        self.assertEqual(response.content.count(smart_str(text, response._charset)),
+             0, "Response should not contain '%s'" % text)
 
     def assertFormError(self, response, form, field, errors):
         """