diff options
| author | Jeremy Dunck <jdunck@gmail.com> | 2012-09-18 20:58:40 +0200 |
|---|---|---|
| committer | Claude Paroz <claude@2xlibre.net> | 2012-09-18 21:05:41 +0200 |
| commit | 40e62a5ccd08f241e977c9ffcb96005b9f2d95e6 (patch) | |
| tree | 3a31d144988509afa74ff43f56b2071ba516b15c /django | |
| parent | 319e1355190d414ee1b095b26fbb494cf9a27578 (diff) | |
Fixed #18980 -- Fixed assertContains regression when passed an object
Diffstat (limited to 'django')
| -rw-r--r-- | django/test/testcases.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/django/test/testcases.py b/django/test/testcases.py index 3c681db329..d37be58a71 100644 --- a/django/test/testcases.py +++ b/django/test/testcases.py @@ -647,6 +647,7 @@ class TransactionTestCase(SimpleTestCase): self.assertEqual(response.status_code, status_code, msg_prefix + "Couldn't retrieve content: Response code was %d" " (expected %d)" % (response.status_code, status_code)) + text = force_text(text, encoding=response._charset) content = response.content.decode(response._charset) if html: content = assert_and_parse_html(self, content, None, @@ -682,6 +683,7 @@ class TransactionTestCase(SimpleTestCase): self.assertEqual(response.status_code, status_code, msg_prefix + "Couldn't retrieve content: Response code was %d" " (expected %d)" % (response.status_code, status_code)) + text = force_text(text, encoding=response._charset) content = response.content.decode(response._charset) if html: content = assert_and_parse_html(self, content, None, |