diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2014-01-12 10:01:13 (GMT) |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2014-01-12 10:01:13 (GMT) |
| commit | c8dadc375e74321e0d74b9d4f98dca5bbd9728d0 (patch) | |
| tree | 270eac84169aae888c4ec5015fec4758af8359e4 | |
| parent | f9bba9c67f7928be185bd81614881ae88a46aaab (diff) | |
| download | cpython-c8dadc375e74321e0d74b9d4f98dca5bbd9728d0.zip cpython-c8dadc375e74321e0d74b9d4f98dca5bbd9728d0.tar.gz cpython-c8dadc375e74321e0d74b9d4f98dca5bbd9728d0.tar.bz2 | |
Fixed incorrect merge in 1638360eea41.
| -rw-r--r-- | Misc/NEWS | 6 |
1 files changed, 1 insertions, 5 deletions
@@ -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 |