summaryrefslogtreecommitdiffstats
path: root/Lib/fileinput.py
diff options
context:
space:
mode:
authorVictor Stinner <vstinner@python.org>2019-10-28 14:40:08 (GMT)
committerGitHub <noreply@github.com>2019-10-28 14:40:08 (GMT)
commite471e72977c83664f13d041c78549140c86c92de (patch)
treefeddc2c15e7199122f6f59992de0dab8f73b6149 /Lib/fileinput.py
parent3bfc8e0fcc707d200c267ff05b052fd6a63c985a (diff)
downloadcpython-e471e72977c83664f13d041c78549140c86c92de.zip
cpython-e471e72977c83664f13d041c78549140c86c92de.tar.gz
cpython-e471e72977c83664f13d041c78549140c86c92de.tar.bz2
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.
Diffstat (limited to 'Lib/fileinput.py')
-rw-r--r--Lib/fileinput.py11
1 files changed, 3 insertions, 8 deletions
diff --git a/Lib/fileinput.py b/Lib/fileinput.py
index c1b0ec9..166c631 100644
--- a/Lib/fileinput.py
+++ b/Lib/fileinput.py
@@ -209,15 +209,10 @@ class FileInput:
self._isstdin = False
self._backupfilename = None
# restrict mode argument to reading modes
- if mode not in ('r', 'rU', 'U', 'rb'):
- raise ValueError("FileInput opening mode must be one of "
- "'r', 'rU', 'U' and 'rb'")
- if 'U' in mode:
- import warnings
- warnings.warn("'U' mode is deprecated",
- DeprecationWarning, 2)
+ if mode not in ('r', 'rb'):
+ raise ValueError("FileInput opening mode must be 'r' or 'rb'")
self._mode = mode
- self._write_mode = mode.replace('r', 'w') if 'U' not in mode else 'w'
+ self._write_mode = mode.replace('r', 'w')
if openhook:
if inplace:
raise ValueError("FileInput cannot use an opening hook in inplace mode")