8000 bpo-43651: PEP 597: Fix EncodingWarning in some tests by methane · Pull Request #25189 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

bpo-43651: PEP 597: Fix EncodingWarning in some tests #25189

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
merged 11 commits into from
Apr 6, 2021
Merged

bpo-43651: PEP 597: Fix EncodingWarning in some tests #25189

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5b6ac7e
Fix _sitebuiltins
methane Apr 5, 2021
b8e4625
Fix test_inspect
methane Apr 5, 2021
8f33b3e
Fix test_interpreters
methane Apr 5, 2021
9a853a2
Fix test_io
methane Apr 5, 2021
5f927b0
Fix test_iter
methane Apr 5, 2021
6005b5a
Fix test_json
methane Apr 5, 2021
af0a0bd
Fix test_linecache
methane Apr 5, 2021
efd7fb0
Fix test_lltrace
methane Apr 5, 2021
98148f6
Fix test_logging
methane Apr 5, 2021
845a5ed
Fix logging
methane Apr 6, 2021
0c1bf84
Fix logging
methane Apr 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed t 8000 o load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix test_iter
  • Loading branch information
@methane
methane committed Apr 5, 2021
commit 5f927b0d028fa10354c39f082828b9ec08522a24
48 changes: 24 additions & 24 deletions Lib/test/test_iter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,13 +337,13 @@ def test_iter_dict(self):

# Test a file
def test_iter_file(self):
f = open(TESTFN, "w")
f = open(TESTFN, "w", encoding="utf-8")
try:
for i in range(5):
f.write("%d\n" % i)
finally:
f.close()
f = open(TESTFN, "r")
f = open(TESTFN, "r", encoding="utf-8")
try:
self.check_for_loop(f, ["0\n", "1\n", "2\n", "3\n", "4\n"], pickle=False)
self.check_for_loop(f, [], pickle=False)
Expand All @@ -366,13 +366,13 @@ def test_builtin_list(self):
self.assertRaises(TypeError, list, list)
self.assertRaises(TypeError, list, 42)

f = open(TESTFN, "w")
f = open(TESTFN, "w", encoding="utf-8")
try:
for i in range(5):
f.write("%d\n" % i)
finally:
f.close()
f = open(TESTFN, "r")
f = open(TESTFN, "r", encoding="utf-8")
try:
self.assertEqual(list(f), ["0\n", "1\n", "2\n", "3\n", "4\n"])
f.seek(0, 0)
Expand All @@ -399,13 +399,13 @@ def test_builtin_tuple(self):
self.assertRaises(TypeError, tuple, list)
self.assertRaises(TypeError, tuple, 42)

f = open(TESTFN, "w")
f = open(TESTFN, "w", encoding="utf-8")
try:
for i in range(5):
f.write("%d\n" % i)
finally:
f.close()
f = open(TESTFN, "r")
f = open(TESTFN, "r", encoding="utf-8")
try:
self.assertEqual(tuple(f), ("0\n", "1\n", "2\n", "3\n", "4\n"))
f.seek(0, 0)
Expand Down Expand Up @@ -476,14 +476,14 @@ def test_builtin_max_min(self):
self.assertEqual(max(d.values()), 3)
self.assertEqual(min(iter(d.values())), 1)

f = open(TESTFN, "w")
f = open(TESTFN, "w", encoding="utf-8")
try:
f.write("medium line\n")
f.write("xtra large line\n")
f.write("itty-bitty line\n")
finally:
f.close()
f = open(TESTFN, "r")
f = open(TESTFN, "r", encoding="utf-8")
try:
self.assertEqual(min(f), "itty-bitty line\n")
f.seek(0, 0)
Expand All @@ -509,13 +509,13 @@ def test_builtin_map(self):
i < len(d) and dkeys[i] or None)
for i in range(3)]

f = open(TESTFN, "w")
f = open(TESTFN, "w", encoding="utf-8")
try:
for i in range(10):
f.write("xy" * i + "\n") # line i has len 2*i+1
finally:
f.close()
f = open(TESTFN, "r")
f = open(TESTFN, "r", encoding="utf-8")
try:
self.assertEqual(list(map(len, f)), list(range(1, 21, 2)))
finally:
Expand Down Expand Up @@ -556,12 +556,12 @@ def __next__(self):
self.i = i+1
return i

f = open(TESTFN, "w")
f = open(TESTFN, "w", encoding="utf-8")
try:
f.write("a\n" "bbb\n" "cc\n")
finally:
f.close()
f = open(TESTFN, "r")
f = open(TESTFN, "r", encoding="utf-8")
try:
self.assertEqual(list(zip(IntsFrom(0), f, IntsFrom(-100))),
[(0, "a\n", -100),
Expand Down Expand Up @@ -624,13 +624,13 @@ def __next__(self):
return "fooled you!"
return next(self.it)

f = open(TESTFN, "w")
f = open(TESTFN, "w", encoding="utf-8")
try:
f.write("a\n" + "b\n" + "c\n")
finally:
f.close()

f = open(TESTFN, "r")
f = open(TESTFN, "r", encoding="utf-8")
# Nasty: string.join(s) can't know whether unicode.join() is needed
# until it's seen all of s's elements. But in this case, f's
# iterator cannot be restarted. So what we're testing here is
Expand Down Expand Up @@ -676,12 +676,12 @@ def test_in_and_not_in(self):
self.assertIn((k, v), d.items())
self.assertNotIn((v, k), d.items())

f = open(TESTFN, "w")
f = open(TESTFN, "w", encoding="utf-8")
try:
f.write("a\n" "b\n" "c\n")
finally:
f.close()
f = open(TESTFN, "r")
f = open(TESTFN, "r", encoding="utf-8")
try:
for chunk in "abc":
f.seek(0, 0)
Expand Down Expand Up @@ -713,12 +713,12 @@ def test_countOf(self):
self.assertEqual(countOf(d.values(), 2j), 1)
self.assertEqual(countOf(d.values(), 1j), 0)

f = open(TESTFN, "w")
f = open(TESTFN, "w", encoding="utf-8")
try:
f.write("a\n" "b\n" "c\n" "b\n")
finally:
f.close()
f = open(TESTFN, "r")
f = open(TESTFN, "r", encoding="utf-8")
try:
for letter, count in ("a", 1), ("b", 2), ("c", 1), ("d", 0):
f.seek(0, 0)
Expand Down Expand Up @@ -748,12 +748,12 @@ def test_indexOf(self):
self.assertRaises(TypeError, indexOf, indexOf, indexOf)
self.assertRaises(ZeroDivisionError, indexOf, BadIterableClass(), 1)

f = open(TESTFN, "w")
f = open(TESTFN, "w", encoding="utf-8")
try:
f.write("a\n" "b\n" "c\n" "d\n" "e\n")
finally:
f.close()
f = open(TESTFN, "r")
f = open(TESTFN, "r", encoding="utf-8")
try:
fiter = iter(f)
self.assertEqual(indexOf(fiter, "b\n"), 1)
Expand All @@ -774,7 +774,7 @@ def test_indexOf(self):

# Test iterators with file.writelines().
def test_writelines(self):
f = open(TESTFN, "w")
f = open(TESTFN, "w", encoding="utf-8")

try:
self.assertRaises(TypeError, f.writelines, None)
Expand Down Expand Up @@ -813,7 +813,7 @@ def __iter__(self):
f.writelines(Whatever(6, 6+2000))
f.close()

f = open(TESTFN)
f = open(TESTFN, encoding="utf-8")
expected = [str(i) + "\n" for i in range(1, 2006)]
self.assertEqual(list(f), expected)

Expand Down Expand Up @@ -857,14 +857,14 @@ def test_unpack_iter(self):
a, b, c = {1: 42, 2: 42, 3: 42}.values()
self.assertEqual((a, b, c), (42, 42, 42))

f = open(TESTFN, "w")
f = open(TESTFN, "w", encoding="utf-8")
lines = ("a\n", "bb\n", "ccc\n")
try:
for line in lines:
f.write(line)
finally:
f.close()
f = open(TESTFN, "r")
f = open(TESTFN, "r", encoding="utf-8")
try:
a, b, c = f
self.assertEqual((a, b, c), lines)
Expand Down
0