Skip to content

bpo-43651: PEP 597: Fix EncodingWarning in test_filecmp #25159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
methane merged 1 commit into from
Apr 5, 2021
Merged

bpo-43651: PEP 597: Fix EncodingWarning in test_filecmp #25159

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Lib/test/test_filecmp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down Expand Up @@ -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):
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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'])
Expand Down