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

Refs #35727 -- Updated response.content.decode calls to use the HttpResponse.text property.

Browse Source 
Signed-off-by: SaJH <wogur981208@gmail.com>
This commit is contained in:
SaJH
2024-10-16 01:11:46 +09:00
committed by Sarah Boyce
parent 4a685bc0dc
commit 0c81775515
12 changed files with 63 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/sitemaps_tests/test_generic.py
View File

@@ -45,7 +45,7 @@ class GenericViewsSitemapTests(SitemapTestsBase):
"%s\n"
"</urlset>"
) % expected
self.assertXMLEqual(response.content.decode(), expected_content)
self.assertXMLEqual(response.text, expected_content)
def test_generic_sitemap_lastmod(self):
test_model = TestModel.objects.first()
@@ -61,7 +61,7 @@ class GenericViewsSitemapTests(SitemapTestsBase):
self.base_url,
test_model.pk,
)
self.assertXMLEqual(response.content.decode(), expected_content)
self.assertXMLEqual(response.text, expected_content)
self.assertEqual(
response.headers["Last-Modified"], "Wed, 13 Mar 2013 10:00:00 GMT"
)
@@ -89,4 +89,4 @@ class GenericViewsSitemapTests(SitemapTestsBase):
<sitemapindex xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
<sitemap><loc>http://example.com/simple/sitemap-generic.xml</loc><lastmod>2013-03-13T10:00:00</lastmod></sitemap>
</sitemapindex>"""
self.assertXMLEqual(response.content.decode("utf-8"), expected_content)
self.assertXMLEqual(response.text, expected_content)

42
tests/sitemaps_tests/test_http.py
View File

@@ -29,7 +29,7 @@ class HTTPSitemapTests(SitemapTestsBase):
self.base_url,
date.today(),
)
self.assertXMLEqual(response.content.decode(), expected_content)
self.assertXMLEqual(response.text, expected_content)
def test_sitemap_not_callable(self):
"""A sitemap may not be callable."""
@@ -42,7 +42,7 @@ class HTTPSitemapTests(SitemapTestsBase):
self.base_url,
date.today(),
)
self.assertXMLEqual(response.content.decode(), expected_content)
self.assertXMLEqual(response.text, expected_content)
def test_paged_sitemap(self):
"""A sitemap may have multiple pages."""
@@ -54,7 +54,7 @@ class HTTPSitemapTests(SitemapTestsBase):
""".format(
self.base_url, date.today()
)
self.assertXMLEqual(response.content.decode(), expected_content)
self.assertXMLEqual(response.text, expected_content)
@override_settings(
TEMPLATES=[
@@ -76,7 +76,7 @@ class HTTPSitemapTests(SitemapTestsBase):
self.base_url,
date.today(),
)
self.assertXMLEqual(response.content.decode(), expected_content)
self.assertXMLEqual(response.text, expected_content)
def test_simple_sitemap_section(self):
"A simple sitemap section can be rendered"
@@ -92,7 +92,7 @@ class HTTPSitemapTests(SitemapTestsBase):
self.base_url,
date.today(),
)
self.assertXMLEqual(response.content.decode(), expected_content)
self.assertXMLEqual(response.text, expected_content)
def test_no_section(self):
response = self.client.get("/simple/sitemap-simple2.xml")
@@ -126,7 +126,7 @@ class HTTPSitemapTests(SitemapTestsBase):
self.base_url,
date.today(),
)
self.assertXMLEqual(response.content.decode(), expected_content)
self.assertXMLEqual(response.text, expected_content)
@override_settings(
TEMPLATES=[
@@ -148,7 +148,7 @@ class HTTPSitemapTests(SitemapTestsBase):
self.base_url,
date.today(),
)
self.assertXMLEqual(response.content.decode(), expected_content)
self.assertXMLEqual(response.text, expected_content)
def test_sitemap_last_modified(self):
"Last-Modified header is set correctly"
@@ -268,7 +268,7 @@ class HTTPSitemapTests(SitemapTestsBase):
"<changefreq>never</changefreq><priority>0.5</priority></url>\n"
"</urlset>"
) % date.today()
self.assertXMLEqual(response.content.decode(), expected_content)
self.assertXMLEqual(response.text, expected_content)
def test_sitemap_get_urls_no_site_1(self):
"""
@@ -316,7 +316,7 @@ class HTTPSitemapTests(SitemapTestsBase):
self.base_url,
date.today(),
)
self.assertXMLEqual(response.content.decode(), expected_content)
self.assertXMLEqual(response.text, expected_content)
def test_x_robots_sitemap(self):
response = self.client.get("/simple/index.xml")
@@ -346,7 +346,7 @@ class HTTPSitemapTests(SitemapTestsBase):
"<changefreq>never</changefreq><priority>0.5</priority></url>\n"
"</urlset>"
).format(self.base_url, self.i18n_model.pk)
self.assertXMLEqual(response.content.decode(), expected_content)
self.assertXMLEqual(response.text, expected_content)
@override_settings(LANGUAGES=(("en", "English"), ("pt", "Portuguese")))
def test_alternate_i18n_sitemap_index(self):
@@ -374,7 +374,7 @@ class HTTPSitemapTests(SitemapTestsBase):
f"{expected_urls}\n"
f"</urlset>"
)
self.assertXMLEqual(response.content.decode(), expected_content)
self.assertXMLEqual(response.text, expected_content)
@override_settings(
LANGUAGES=(("en", "English"), ("pt", "Portuguese"), ("es", "Spanish"))
@@ -404,7 +404,7 @@ class HTTPSitemapTests(SitemapTestsBase):
f"{expected_urls}\n"
f"</urlset>"
)
self.assertXMLEqual(response.content.decode(), expected_content)
self.assertXMLEqual(response.text, expected_content)
@override_settings(LANGUAGES=(("en", "English"), ("pt", "Portuguese")))
def test_alternate_i18n_sitemap_xdefault(self):
@@ -434,7 +434,7 @@ class HTTPSitemapTests(SitemapTestsBase):
f"{expected_urls}\n"
f"</urlset>"
)
self.assertXMLEqual(response.content.decode(), expected_content)
self.assertXMLEqual(response.text, expected_content)
@override_settings(LANGUAGES=(("en", "English"), ("pt", "Portuguese")))
def test_language_for_item_i18n_sitemap(self):
@@ -460,7 +460,7 @@ class HTTPSitemapTests(SitemapTestsBase):
f"{expected_urls}\n"
f"</urlset>"
)
self.assertXMLEqual(response.content.decode(), expected_content)
self.assertXMLEqual(response.text, expected_content)
@override_settings(LANGUAGES=(("en", "English"), ("pt", "Portuguese")))
def test_alternate_language_for_item_i18n_sitemap(self):
@@ -500,7 +500,7 @@ class HTTPSitemapTests(SitemapTestsBase):
f"{expected_urls}\n"
f"</urlset>"
)
self.assertXMLEqual(response.content.decode(), expected_content)
self.assertXMLEqual(response.text, expected_content)
def test_sitemap_without_entries(self):
response = self.client.get("/sitemap-without-entries/sitemap.xml")
@@ -510,7 +510,7 @@ class HTTPSitemapTests(SitemapTestsBase):
'xmlns:xhtml="http://www.w3.org/1999/xhtml">\n\n'
"</urlset>"
)
self.assertXMLEqual(response.content.decode(), expected_content)
self.assertXMLEqual(response.text, expected_content)
def test_callable_sitemod_partial(self):
"""
@@ -535,8 +535,8 @@ class HTTPSitemapTests(SitemapTestsBase):
"<loc>http://example.com/location/</loc></url>\n"
"</urlset>"
)
self.assertXMLEqual(index_response.content.decode(), expected_content_index)
self.assertXMLEqual(sitemap_response.content.decode(), expected_content_sitemap)
self.assertXMLEqual(index_response.text, expected_content_index)
self.assertXMLEqual(sitemap_response.text, expected_content_sitemap)
def test_callable_sitemod_full(self):
"""
@@ -566,8 +566,8 @@ class HTTPSitemapTests(SitemapTestsBase):
"<lastmod>2014-03-13</lastmod></url>\n"
"</urlset>"
)
self.assertXMLEqual(index_response.content.decode(), expected_content_index)
self.assertXMLEqual(sitemap_response.content.decode(), expected_content_sitemap)
self.assertXMLEqual(index_response.text, expected_content_index)
self.assertXMLEqual(sitemap_response.text, expected_content_sitemap)
def test_callable_sitemod_no_items(self):
index_response = self.client.get("/callable-lastmod-no-items/index.xml")
@@ -577,4 +577,4 @@ class HTTPSitemapTests(SitemapTestsBase):
<sitemap><loc>http://example.com/simple/sitemap-callable-lastmod.xml</loc></sitemap>
</sitemapindex>
"""
self.assertXMLEqual(index_response.content.decode(), expected_content_index)
self.assertXMLEqual(index_response.text, expected_content_index)

8
tests/sitemaps_tests/test_https.py
View File

@@ -20,7 +20,7 @@ class HTTPSSitemapTests(SitemapTestsBase):
self.base_url,
date.today(),
)
self.assertXMLEqual(response.content.decode(), expected_content)
self.assertXMLEqual(response.text, expected_content)
def test_secure_sitemap_section(self):
"A secure sitemap section can be rendered"
@@ -36,7 +36,7 @@ class HTTPSSitemapTests(SitemapTestsBase):
self.base_url,
date.today(),
)
self.assertXMLEqual(response.content.decode(), expected_content)
self.assertXMLEqual(response.text, expected_content)
@override_settings(SECURE_PROXY_SSL_HEADER=False)
@@ -54,7 +54,7 @@ class HTTPSDetectionSitemapTests(SitemapTestsBase):
self.base_url.replace("http://", "https://"),
date.today(),
)
self.assertXMLEqual(response.content.decode(), expected_content)
self.assertXMLEqual(response.text, expected_content)
def test_sitemap_section_with_https_request(self):
"A sitemap section requested in HTTPS is rendered with HTTPS links"
@@ -70,4 +70,4 @@ class HTTPSDetectionSitemapTests(SitemapTestsBase):
self.base_url.replace("http://", "https://"),
date.today(),
)
self.assertXMLEqual(response.content.decode(), expected_content)
self.assertXMLEqual(response.text, expected_content)