[Python-checkins] bpo-43651: PEP 597: Fix EncodingWarning in test_filecmp (GH-25159)
methane
webhook-mailer at python.org
Sun Apr 4 23:32:42 EDT 2021
https://github.com/python/cpython/commit/ee952b5c7355cb64179ca9bb77b13e7738132d3d
commit: ee952b5c7355cb64179ca9bb77b13e7738132d3d
branch: master
author: Inada Naoki <songofacandy at gmail.com>
committer: methane <songofacandy at gmail.com>
date: 2021-04-05T12:32:35+09:00
summary:
bpo-43651: PEP 597: Fix EncodingWarning in test_filecmp (GH-25159)
files:
M Lib/test/test_filecmp.py
diff --git a/Lib/test/test_filecmp.py b/Lib/test/test_filecmp.py
index fa4f67b6eb5f9..64ba5a0e18169 100644
--- a/Lib/test/test_filecmp.py
+++ b/Lib/test/test_filecmp.py
@@ -15,10 +15,10 @@ def setUp(self):
self.name_diff = os_helper.TESTFN + '-diff'
data = 'Contents of file go here.\n'
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)
- 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')
self.dir = tempfile.gettempdir()
@@ -72,10 +72,10 @@ def setUp(self):
fn = 'FiLe' # Verify case-insensitive comparison
else:
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)
- 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')
def tearDown(self):
@@ -103,7 +103,7 @@ def test_cmpfiles(self):
"Comparing directory to same fails")
# 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')
self.assertFalse(filecmp.cmpfiles(self.dir, self.dir_same,
@@ -188,7 +188,7 @@ def test_dircmp(self):
self._assert_report(d.report, expected_report)
# 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')
d = filecmp.dircmp(self.dir, self.dir_diff)
self.assertEqual(d.same_files, ['file'])
More information about the Python-checkins
mailing list