diff options
| author | Raymond Hettinger <python@rcn.com> | 2016-08-26 04:12:16 (GMT) |
|---|---|---|
| committer | Raymond Hettinger <python@rcn.com> | 2016-08-26 04:12:16 (GMT) |
| commit | f74c33ad5c94f1f07f574336dc2d5a6345acdcc7 (patch) | |
| tree | 7de71390a5ea30877d31e56c5fabf44529c86fd2 /Doc/whatsnew | |
| parent | 8f2ee0d5ffe82c5873bff914835724be0107b0c6 (diff) | |
| parent | 7ea386e56e76deb2ceeb87c0ac4b346e24cd82e1 (diff) | |
| download | cpython-f74c33ad5c94f1f07f574336dc2d5a6345acdcc7.zip cpython-f74c33ad5c94f1f07f574336dc2d5a6345acdcc7.tar.gz cpython-f74c33ad5c94f1f07f574336dc2d5a6345acdcc7.tar.bz2 | |
Merge
Diffstat (limited to 'Doc/whatsnew')
| -rw-r--r-- | Doc/whatsnew/2.0.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/whatsnew/2.0.rst b/Doc/whatsnew/2.0.rst index 4d49af1..5bd12ba 100644 --- a/Doc/whatsnew/2.0.rst +++ b/Doc/whatsnew/2.0.rst @@ -166,7 +166,7 @@ encoding. Encodings are named by strings, such as ``'ascii'``, ``'utf-8'``, registering new encodings that are then available throughout a Python program. If an encoding isn't specified, the default encoding is usually 7-bit ASCII, though it can be changed for your Python installation by calling the -``sys.setdefaultencoding(encoding)`` function in a customised version of +``sys.setdefaultencoding(encoding)`` function in a customized version of :file:`site.py`. Combining 8-bit and Unicode strings always coerces to Unicode, using the default @@ -1139,7 +1139,7 @@ module. Unix, not to be confused with :program:`gzip`\ -format files (which are supported by the :mod:`gzip` module) (Contributed by James C. Ahlstrom.) -* :mod:`imputil`: A module that provides a simpler way for writing customised +* :mod:`imputil`: A module that provides a simpler way for writing customized import hooks, in comparison to the existing :mod:`ihooks` module. (Implemented by Greg Stein, with much discussion on python-dev along the way.) |