summaryrefslogtreecommitdiffstats
path: root/Misc/NEWS
diff options
context:
space:
mode:
authorSenthil Kumaran <senthil@uthcode.com>2014-01-12 06:22:21 (GMT)
committerSenthil Kumaran <senthil@uthcode.com>2014-01-12 06:22:21 (GMT)
commitd87346c0ced1f39b60de4688d6d73355d36f2b97 (patch)
tree6c56d2b0f2ec62ef790a6cb48a294d3c7d546cdd /Misc/NEWS
parent932c3458df7332658de80835a78a781ab60fdb1e (diff)
parentb4cbb92fbe6290c3574e73288de9e9cbb60b7688 (diff)
downloadcpython-d87346c0ced1f39b60de4688d6d73355d36f2b97.zip
cpython-d87346c0ced1f39b60de4688d6d73355d36f2b97.tar.gz
cpython-d87346c0ced1f39b60de4688d6d73355d36f2b97.tar.bz2
merge from 3.3
Issue #19092 - Raise a correct exception when cgi.FieldStorage is given an invalid file-obj. Also use __bool__ to determine the bool of the FieldStorage object.
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