summaryrefslogtreecommitdiff
path: root/Doc/library/functions.rst
diff options
context:
space:
mode:
authorChristian Heimes <christian@cheimes.de>2013-11-23 21:14:01 +0100
committerChristian Heimes <christian@cheimes.de>2013-11-23 21:14:01 +0100
commit310e4c43cd87df44b170acf43f63cb94d00321c5 (patch)
treea0f7a9343a149ed2d0709f7f463e33903f6f56d5 /Doc/library/functions.rst
parente8b1ba1699d429b1e80ea7d31032628d09c3e43e (diff)
parentdd52c5a1c46b4d8e42e5e7a00f9b307f113de08d (diff)
downloadcpython-git-310e4c43cd87df44b170acf43f63cb94d00321c5.tar.gz
merge
Diffstat (limited to 'Doc/library/functions.rst')
-rw-r--r--Doc/library/functions.rst6
1 files changed, 4 insertions, 2 deletions
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
index ffee09efce..474bb1dfa0 100644
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -872,8 +872,7 @@ are always available. They are listed here in alphabetical order.
``'b'`` binary mode
``'t'`` text mode (default)
``'+'`` open a disk file for updating (reading and writing)
- ``'U'`` universal newlines mode (for backwards compatibility; should
- not be used in new code)
+ ``'U'`` :term:`universal newlines` mode (deprecated)
========= ===============================================================
The default mode is ``'r'`` (open for reading text, synonym of ``'rt'``).
@@ -1029,6 +1028,9 @@ are always available. They are listed here in alphabetical order.
.. versionchanged:: 3.4
The file is now non-inheritable.
+ .. deprecated-removed:: 3.4 4.0
+ The ``'U'`` mode.
+
.. XXX works for bytes too, but should it?
.. function:: ord(c)