Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Fixed incorrect merge in 1638360eea41.

This commit is contained in:
Serhiy Storchaka 2014-01-12 12:01:13 +02:00
parent f9bba9c67f
commit c8dadc375e
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Misc/NEWS
View File

@ -25,14 +25,10 @@ Core and Builtins
Library
-------
<<<<<<< local
- Issue #20152: Ported Python/import.c over to Argument Clinic.
=======
- Issue #19097: Raise the correct Exception when cgi.FieldStorage is given an
Invalid fileobj.
- Issue #20217: Fix build in SCHED_SPORADIC is defined.
>>>>>>> other
- Issue #20152: Ported Python/import.c over to Argument Clinic.
- Issue #13107: argparse and optparse no longer raises an exception when output
a help on environment with too small COLUMNS. Based on patch by