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.

diff --cc Lib/cgi.py
Simple merge

diff --cc Misc/NEWS
index b83fd17aef8483f1bbd2fca53593ec713a23c4f5,552e949cdb569c0c5659daaef6985ba9df162170..01c48cb2bca8fdfc6b9cab86479f5fadf69cc6d5
--- 1/Misc/NEWS
--- 2/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