summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2013-12-31 16:18:01 (GMT)
committerR David Murray <rdmurray@bitdance.com>2013-12-31 16:18:01 (GMT)
commitfced3ec2db437097e45e1311c321a74cf96a4a06 (patch)
treeb33fd65aee4fe6a7c27c38e36186363d28547ef1 /Doc
parent2bc930f0442e2bc7ea6d86b74352ad8ac90a40c8 (diff)
downloadcpython-fced3ec2db437097e45e1311c321a74cf96a4a06.zip
cpython-fced3ec2db437097e45e1311c321a74cf96a4a06.tar.gz
cpython-fced3ec2db437097e45e1311c321a74cf96a4a06.tar.bz2
whatsnew: argparse FileType accepts errors and encodings args.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/argparse.rst3
-rw-r--r--Doc/whatsnew/3.4.rst8
2 files changed, 11 insertions, 0 deletions
diff --git a/Doc/library/argparse.rst b/Doc/library/argparse.rst
index 51abc7a..b1b5135 100644
--- a/Doc/library/argparse.rst
+++ b/Doc/library/argparse.rst
@@ -1671,6 +1671,9 @@ FileType objects
>>> parser.parse_args(['-'])
Namespace(infile=<_io.TextIOWrapper name='<stdin>' encoding='UTF-8'>)
+ .. versionadded:: 3.4
+ The *encodings* and *errors* keyword arguments.
+
Argument groups
^^^^^^^^^^^^^^^
diff --git a/Doc/whatsnew/3.4.rst b/Doc/whatsnew/3.4.rst
index 5b68243..19d71cc 100644
--- a/Doc/whatsnew/3.4.rst
+++ b/Doc/whatsnew/3.4.rst
@@ -495,6 +495,14 @@ The :meth:`~aifc.getparams` method now returns a namedtuple rather than a
plain tuple. (Contributed by Claudiu Popa in :issue:`17818`.)
+argparse
+--------
+
+The :class:`~argparse.FileType` class now accepts *encoding* and
+*errors* arguments, which are passed through to :func:`open`. (Contributed
+by Lucas Maystre in :issue:`11175`.)
+
+
audioop
-------