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 #23919 -- Replaced codecs.open() with open().

Browse Source 
On Python 3, open() handles encodings.
This commit is contained in:
Jon Dufresne
2019-01-27 08:30:20 -08:00
committed by Tim Graham
parent 20ea68c4fe
commit ce7293bc91
3 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/admin_scripts/tests.py
View File

@@ -3,7 +3,6 @@ A series of tests to establish that the command-line management tools work as
advertised - especially with regards to the handling of the advertised - especially with regards to the handling of the
DJANGO_SETTINGS_MODULE and default settings.py files. DJANGO_SETTINGS_MODULE and default settings.py files.
""" """
import codecs
import os import os
import re import re
import shutil import shutil
@@ -2178,7 +2177,7 @@ class StartProject(LiveServerTestCase, AdminScriptTestCase):
self.assertNoOutput(err) self.assertNoOutput(err)
self.assertTrue(os.path.isdir(testproject_dir)) self.assertTrue(os.path.isdir(testproject_dir))
path = os.path.join(testproject_dir, 'ticket-18091-non-ascii-template.txt') path = os.path.join(testproject_dir, 'ticket-18091-non-ascii-template.txt')
with codecs.open(path, 'r', encoding='utf-8') as f: with open(path, encoding='utf-8') as f:
self.assertEqual(f.read().splitlines(False), [ self.assertEqual(f.read().splitlines(False), [
'Some non-ASCII text for testing ticket #18091:', 'Some non-ASCII text for testing ticket #18091:',
'üäö €']) 'üäö €'])

3
tests/staticfiles_tests/cases.py
View File

@@ -1,4 +1,3 @@
import codecs
import os import os
import shutil import shutil
import tempfile import tempfile
@@ -86,7 +85,7 @@ class CollectionTestCase(BaseStaticFilesMixin, SimpleTestCase):
def _get_file(self, filepath): def _get_file(self, filepath):
assert filepath, 'filepath is empty.' assert filepath, 'filepath is empty.'
filepath = os.path.join(settings.STATIC_ROOT, filepath) filepath = os.path.join(settings.STATIC_ROOT, filepath)
with codecs.open(filepath, "r", "utf-8") as f: with open(filepath, encoding='utf-8') as f:
return f.read() return f.read()

3
tests/staticfiles_tests/test_management.py
View File

@@ -1,4 +1,3 @@
import codecs
import datetime import datetime
import os import os
import shutil import shutil
@@ -63,7 +62,7 @@ class TestFindStatic(TestDefaults, CollectionTestCase):
""" """
def _get_file(self, filepath): def _get_file(self, filepath):
path = call_command('findstatic', filepath, all=False, verbosity=0, stdout=StringIO()) path = call_command('findstatic', filepath, all=False, verbosity=0, stdout=StringIO())
with codecs.open(path, "r", "utf-8") as f: with open(path, encoding='utf-8') as f:
return f.read() return f.read()
def test_all_files(self): def test_all_files(self):