[Python-checkins] cpython (merge default -> default): Merge heads

[serhiy.storchaka]

http://hg.python.org/cpython/rev/c9f424394b96
changeset:   86345:c9f424394b96
parent:      86344:261d9bf0cc2b
parent:      86335:b9d3e99ea516
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Sun Oct 13 23:22:09 2013 +0300
summary:
  Merge heads

files:
  Lib/cgi.py |  1 -
  Misc/NEWS  |  8 --------
  2 files changed, 0 insertions(+), 9 deletions(-)


diff --git a/Lib/cgi.py b/Lib/cgi.py
--- a/Lib/cgi.py
+++ b/Lib/cgi.py
@@ -676,7 +676,6 @@
                 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
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1346,14 +1346,6 @@
 - 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

-- 
Repository URL: http://hg.python.org/cpython