summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2014-03-14 00:56:27 (GMT)
committerR David Murray <rdmurray@bitdance.com>2014-03-14 00:56:27 (GMT)
commit44b03c5bf07443d7b04053888ffecb0c10b8411b (patch)
tree854d2db893cce35d1b362050fc8e7036dfb59cfb /Doc
parentfb2c2db0fbccc614519021a0dbea923d54686e68 (diff)
downloadcpython-44b03c5bf07443d7b04053888ffecb0c10b8411b.zip
cpython-44b03c5bf07443d7b04053888ffecb0c10b8411b.tar.gz
cpython-44b03c5bf07443d7b04053888ffecb0c10b8411b.tar.bz2
whatsnew: small tweaks to codecs entry.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/whatsnew/3.4.rst12
1 files changed, 6 insertions, 6 deletions
diff --git a/Doc/whatsnew/3.4.rst b/Doc/whatsnew/3.4.rst
index 7c4c43a..dae0c54 100644
--- a/Doc/whatsnew/3.4.rst
+++ b/Doc/whatsnew/3.4.rst
@@ -289,10 +289,10 @@ module (and have been covered by the regression test suite) since Python 2.4,
but were previously only discoverable through runtime introspection.
Unlike the convenience methods on :class:`str`, :class:`bytes` and
-:class:`bytearray`, these convenience functions support arbitrary codecs
-in both Python 2 and Python 3, rather than being limited to Unicode text
-encodings (in Python 3) or ``basestring`` <-> ``basestring`` conversions
-(in Python 2).
+:class:`bytearray`, the :mod:`codecs` convenience functions support arbitrary
+codecs in both Python 2 and Python 3, rather than being limited to Unicode text
+encodings (in Python 3) or ``basestring`` <-> ``basestring`` conversions (in
+Python 2).
In Python 3.4, the interpreter is able to identify the known non-text
encodings provided in the standard library and direct users towards these
@@ -315,7 +315,7 @@ general purpose convenience functions when appropriate::
In a related change, whenever it is feasible without breaking backwards
compatibility, exceptions raised during encoding and decoding operations
-will be wrapped in a chained exception of the same type that mentions the
+are wrapped in a chained exception of the same type that mentions the
name of the codec responsible for producing the error::
>>> import codecs
@@ -361,7 +361,7 @@ as::
The binary and text transforms provided in the standard library are detailed
in :ref:`binary-transforms` and :ref:`text-transforms`.
-(Contributed by Nick Coghlan in :issue:`7475`, , :issue:`17827`,
+(Contributed by Nick Coghlan in :issue:`7475`, :issue:`17827`,
:issue:`17828` and :issue:`19619`)