summaryrefslogtreecommitdiffstats
path: root/Misc/NEWS
diff options
context:
space:
mode:
Diffstat (limited to 'Misc/NEWS')
-rw-r--r--Misc/NEWS7
1 files changed, 7 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index b83fd17..01c48cb 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -25,7 +25,14 @@ 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 #13107: argparse and optparse no longer raises an exception when output
a help on environment with too small COLUMNS. Based on patch by