bpo-37330: open() no longer accept 'U' in file mode (GH-16959)
open(), io.open(), codecs.open() and fileinput.FileInput no longer
accept "U" ("universal newline") in the file mode. This flag was
deprecated since Python 3.3.diff --git a/Lib/test/test_fileinput.py b/Lib/test/test_fileinput.py
index 014f19e..819557d 100644
--- a/Lib/test/test_fileinput.py
+++ b/Lib/test/test_fileinput.py
@@ -226,19 +226,11 @@
self.assertEqual(fi.fileno(), -1)
def test_opening_mode(self):
- try:
- # invalid mode, should raise ValueError
- fi = FileInput(mode="w")
- self.fail("FileInput should reject invalid mode argument")
- except ValueError:
- pass
- # try opening in universal newline mode
- t1 = self.writeTmp(b"A\nB\r\nC\rD", mode="wb")
- with check_warnings(('', DeprecationWarning)):
- fi = FileInput(files=t1, mode="U")
- with check_warnings(('', DeprecationWarning)):
- lines = list(fi)
- self.assertEqual(lines, ["A\n", "B\n", "C\n", "D"])
+ # invalid modes
+ for mode in ('w', 'rU', 'U'):
+ with self.subTest(mode=mode):
+ with self.assertRaises(ValueError):
+ FileInput(mode=mode)
def test_stdin_binary_mode(self):
with mock.patch('sys.stdin') as m_stdin:
@@ -985,10 +977,6 @@
self.assertEqual(lines, expected_lines)
check('r', ['A\n', 'B\n', 'C\n', 'D\u20ac'])
- with self.assertWarns(DeprecationWarning):
- check('rU', ['A\n', 'B\n', 'C\n', 'D\u20ac'])
- with self.assertWarns(DeprecationWarning):
- check('U', ['A\n', 'B\n', 'C\n', 'D\u20ac'])
with self.assertRaises(ValueError):
check('rb', ['A\n', 'B\r\n', 'C\r', 'D\u20ac'])