mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-28 11:15:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fixed incorrect merge in 1638360eea41.

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