merge 3.4

This commit is contained in:
Benjamin Peterson 2014-05-31 13:17:15 -07:00
commit da30b46e57
1 changed files with 1 additions and 1 deletions

View File

@ -392,7 +392,7 @@ and off individually. They are described here in more detail.
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`.