[Python-checkins] cpython (merge 3.4 -> default): merge 3.4

benjamin.peterson python-checkins at python.org
Sat May 31 22:17:24 CEST 2014


http://hg.python.org/cpython/rev/a53ea2e23c14
changeset:   90933:a53ea2e23c14
parent:      90923:f1393e826608
parent:      90932:5d21491733d8
user:        Benjamin Peterson <benjamin at python.org>
date:        Sat May 31 13:17:15 2014 -0700
summary:
  merge 3.4

files:
  Doc/library/2to3.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/library/2to3.rst b/Doc/library/2to3.rst
--- a/Doc/library/2to3.rst
+++ b/Doc/library/2to3.rst
@@ -392,7 +392,7 @@
    Replaces use of the :class:`set` constructor with set literals.  This fixer
    is optional.
 
-.. 2to3fixer:: standard_error
+.. 2to3fixer:: standarderror
 
    Renames :exc:`StandardError` to :exc:`Exception`.
 

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list