test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[py3] Favoured unicode strings in assert(Not)Contains 

In Python 3, HTMLParser does not support bytestrings.
This commit is contained in:
Claude Paroz 2012-08-14 12:19:17 +02:00
parent e04230e2e4
commit d1452f6097
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
django/test/testcases.py
View File

@ -647,14 +647,13 @@ class TransactionTestCase(SimpleTestCase):
self.assertEqual(response.status_code, status_code, self.assertEqual(response.status_code, status_code,
msg_prefix + "Couldn't retrieve content: Response code was %d" msg_prefix + "Couldn't retrieve content: Response code was %d"
" (expected %d)" % (response.status_code, status_code)) " (expected %d)" % (response.status_code, status_code))
enc_text = smart_bytes(text, response._charset) content = response.content.decode(response._charset)
content = response.content
if html: if html:
content = assert_and_parse_html(self, content, None, content = assert_and_parse_html(self, content, None,
"Response's content is not valid HTML:") "Response's content is not valid HTML:")
enc_text = assert_and_parse_html(self, enc_text, None, text = assert_and_parse_html(self, text, None,
"Second argument is not valid HTML:") "Second argument is not valid HTML:")
real_count = content.count(enc_text) real_count = content.count(text)
if count is not None: if count is not None:
self.assertEqual(real_count, count, self.assertEqual(real_count, count,
msg_prefix + "Found %d instances of '%s' in response" msg_prefix + "Found %d instances of '%s' in response"
@ -683,14 +682,13 @@ class TransactionTestCase(SimpleTestCase):
self.assertEqual(response.status_code, status_code, self.assertEqual(response.status_code, status_code,
msg_prefix + "Couldn't retrieve content: Response code was %d" msg_prefix + "Couldn't retrieve content: Response code was %d"
" (expected %d)" % (response.status_code, status_code)) " (expected %d)" % (response.status_code, status_code))
enc_text = smart_bytes(text, response._charset) content = response.content.decode(response._charset)
content = response.content
if html: if html:
content = assert_and_parse_html(self, content, None, content = assert_and_parse_html(self, content, None,
'Response\'s content is not valid HTML:') 'Response\'s content is not valid HTML:')
enc_text = assert_and_parse_html(self, enc_text, None, text = assert_and_parse_html(self, text, None,
'Second argument is not valid HTML:') 'Second argument is not valid HTML:')
self.assertEqual(content.count(enc_text), 0, self.assertEqual(content.count(text), 0,
msg_prefix + "Response should not contain '%s'" % text) msg_prefix + "Response should not contain '%s'" % text)
def assertFormError(self, response, form, field, errors, msg_prefix=''): def assertFormError(self, response, form, field, errors, msg_prefix=''):