Trunk merge.

This commit is contained in:
Barry Warsaw 2014-12-01 18:17:29 -05:00
commit 6f3eb39968
1 changed files with 0 additions and 3 deletions

View File

@ -403,9 +403,6 @@ Library
- Issue #17442: InteractiveInterpreter now displays the full chained traceback - Issue #17442: InteractiveInterpreter now displays the full chained traceback
in its showtraceback method, to match the built in interactive interpreter. in its showtraceback method, to match the built in interactive interpreter.
Tools/Demos
-----------
- Issue #22314: pydoc now works when the LINES environment variable is set. - Issue #22314: pydoc now works when the LINES environment variable is set.
- Issue #10510: distutils register and upload methods now use HTML standards - Issue #10510: distutils register and upload methods now use HTML standards