Merge heads

2 files changed, 0 insertions, 9 deletions

diff --git a/Lib/cgi.py b/Lib/cgi.py
index b6fd407..1d8040c 100755
--- a/Lib/cgi.py
+++ b/Lib/cgi.py
@@ -676,7 +676,6 @@ class FieldStorage:
                 encoding=self.encoding, errors=self.errors)
             for key, value in query:
                 self.list.append(MiniFieldStorage(key, value))
-            FieldStorageClass = None
 
         klass = self.FieldStorageClass or self.__class__
         first_line = self.fp.readline() # bytes
diff --git a/Misc/NEWS b/Misc/NEWS
index 2d47040..c34ad8d 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1346,14 +1346,6 @@ Tools/Demos
 - Issue #12990: The "Python Launcher" on OSX could not launch python scripts
   that have paths that include wide characters.
 
-What's New in Python 3.3.1 release candidate 1?
-===============================================
-
-*Release date: 24-Mar-2013*
-
-Core and Builtins
------------------
-
 - Issue #17328: Fix possible refleak in dict.setdefault.
 
 - Issue #17275: Corrected class name in init error messages of the C version of