From: Senthil Kumaran <senthil@uthcode.com>
Date: Sun, 12 Jan 2014 06:22:21 +0000 (-0800)
Subject: merge from 3.3
X-Git-Tag: v3.4.0b3~176
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d87346c0ced1f39b60de4688d6d73355d36f2b97;p=python

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.
---

d87346c0ced1f39b60de4688d6d73355d36f2b97
diff --cc Misc/NEWS
index b83fd17aef,552e949cdb..01c48cb2bc
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -25,7 -25,28 +25,14 @@@ Core and Builtin
  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