Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

bpo-43651: PEP 597: Fix EncodingWarning in test_filecmp (GH-25159)

This commit is contained in:
Inada Naoki 2021-04-05 12:32:35 +09:00 committed by GitHub
parent de522a89e4
commit ee952b5c73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Lib/test/test_filecmp.py
View File

@ -15,10 +15,10 @@ class FileCompareTestCase(unittest.TestCase):
self.name_diff = os_helper.TESTFN + '-diff' self.name_diff = os_helper.TESTFN + '-diff'
data = 'Contents of file go here.\n' data = 'Contents of file go here.\n'
for name in [self.name, self.name_same, self.name_diff]: for name in [self.name, self.name_same, self.name_diff]:
with open(name, 'w') as output: with open(name, 'w', encoding="utf-8") as output:
output.write(data) output.write(data)
with open(self.name_diff, 'a+') as output: with open(self.name_diff, 'a+', encoding="utf-8") as output:
output.write('An extra line.\n') output.write('An extra line.\n')
self.dir = tempfile.gettempdir() self.dir = tempfile.gettempdir()
@ -72,10 +72,10 @@ class DirCompareTestCase(unittest.TestCase):
fn = 'FiLe' # Verify case-insensitive comparison fn = 'FiLe' # Verify case-insensitive comparison
else: else:
fn = 'file' fn = 'file'
with open(os.path.join(dir, fn), 'w') as output: with open(os.path.join(dir, fn), 'w', encoding="utf-8") as output:
output.write(data) output.write(data)
with open(os.path.join(self.dir_diff, 'file2'), 'w') as output: with open(os.path.join(self.dir_diff, 'file2'), 'w', encoding="utf-8") as output:
output.write('An extra file.\n') output.write('An extra file.\n')
def tearDown(self): def tearDown(self):
@ -103,7 +103,7 @@ class DirCompareTestCase(unittest.TestCase):
"Comparing directory to same fails") "Comparing directory to same fails")
# Add different file2 # Add different file2
with open(os.path.join(self.dir, 'file2'), 'w') as output: with open(os.path.join(self.dir, 'file2'), 'w', encoding="utf-8") as output:
output.write('Different contents.\n') output.write('Different contents.\n')
self.assertFalse(filecmp.cmpfiles(self.dir, self.dir_same, self.assertFalse(filecmp.cmpfiles(self.dir, self.dir_same,
@ -188,7 +188,7 @@ class DirCompareTestCase(unittest.TestCase):
self._assert_report(d.report, expected_report) self._assert_report(d.report, expected_report)
# Add different file2 # Add different file2
with open(os.path.join(self.dir_diff, 'file2'), 'w') as output: with open(os.path.join(self.dir_diff, 'file2'), 'w', encoding="utf-8") as output:
output.write('Different contents.\n') output.write('Different contents.\n')
d = filecmp.dircmp(self.dir, self.dir_diff) d = filecmp.dircmp(self.dir, self.dir_diff)
self.assertEqual(d.same_files, ['file']) self.assertEqual(d.same_files, ['file'])