diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2016-04-27 20:13:46 (GMT) |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2016-04-27 20:13:46 (GMT) |
| commit | b275210a3b0e04691ebd1c1d0374720be59911b9 (patch) | |
| tree | de432dfc32f21bd012351ae1f92758fbe6332d6b /Doc | |
| parent | 258a5d4dcb0fbf787c5e7e78b30e200534753413 (diff) | |
| download | cpython-b275210a3b0e04691ebd1c1d0374720be59911b9.zip cpython-b275210a3b0e04691ebd1c1d0374720be59911b9.tar.gz cpython-b275210a3b0e04691ebd1c1d0374720be59911b9.tar.bz2 | |
Issue #25788: fileinput.hook_encoded() now supports an "errors" argument
for passing to open. Original patch by Joseph Hackman.
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/library/fileinput.rst | 10 | ||||
| -rw-r--r-- | Doc/whatsnew/3.6.rst | 7 |
2 files changed, 14 insertions, 3 deletions
diff --git a/Doc/library/fileinput.rst b/Doc/library/fileinput.rst index 3433682..8efe8e3 100644 --- a/Doc/library/fileinput.rst +++ b/Doc/library/fileinput.rst @@ -193,10 +193,14 @@ The two following opening hooks are provided by this module: Usage example: ``fi = fileinput.FileInput(openhook=fileinput.hook_compressed)`` -.. function:: hook_encoded(encoding) +.. function:: hook_encoded(encoding, errors=None) Returns a hook which opens each file with :func:`open`, using the given - *encoding* to read the file. + *encoding* and *errors* to read the file. Usage example: ``fi = - fileinput.FileInput(openhook=fileinput.hook_encoded("iso-8859-1"))`` + fileinput.FileInput(openhook=fileinput.hook_encoded("utf-8", + "surrogateescape"))`` + + .. versionchanged:: 3.6 + Added the optional *errors* parameter. diff --git a/Doc/whatsnew/3.6.rst b/Doc/whatsnew/3.6.rst index 99223af..be4c014 100644 --- a/Doc/whatsnew/3.6.rst +++ b/Doc/whatsnew/3.6.rst @@ -358,6 +358,13 @@ The :func:`~zlib.compress` function now accepts keyword arguments. (Contributed by Aviv Palivoda in :issue:`26243`.) +fileinput +--------- + +:func:`~fileinput.hook_encoded` now supports the *errors* argument. +(Contributed by Joseph Hackman in :issue:`25788`.) + + Optimizations ============= |