bpo-43651: PEP 597: Fix EncodingWarning in some tests (GH-25189)
* Fix _sitebuiltins
* Fix test_inspect
* Fix test_interpreters
* Fix test_io
* Fix test_iter
* Fix test_json
* Fix test_linecache
* Fix test_lltrace
* Fix test_logging
* Fix logging
diff --git a/Lib/test/test_iter.py b/Lib/test/test_iter.py
index a7658b5..20cb9c0 100644
--- a/Lib/test/test_iter.py
+++ b/Lib/test/test_iter.py
@@ -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)
@@ -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)
@@ -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)
@@ -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)
@@ -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:
@@ -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),
@@ -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
@@ -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)
@@ -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)
@@ -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)
@@ -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)
@@ -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)
@@ -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)