summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2013-10-13 23:22:09 +0300
committerSerhiy Storchaka <storchaka@gmail.com>2013-10-13 23:22:09 +0300
commit6c64f23340d511294fe148953a32ba7b7b99b9ef (patch)
treef3dd5d7cf10fcc520ba71f5020ba510b595e038f
parent98b28fddd8e63e1a9410facee3e41925eed8ac46 (diff)
parent12ec29f1051cff7b69f31a89ad4df7a2261892e2 (diff)
downloadcpython-git-6c64f23340d511294fe148953a32ba7b7b99b9ef.tar.gz
Merge heads
-rwxr-xr-xLib/cgi.py1
-rw-r--r--Misc/NEWS8
2 files changed, 0 insertions, 9 deletions
diff --git a/Lib/cgi.py b/Lib/cgi.py
index b6fd407454..1d8040cc7a 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 2d47040598..c34ad8dd0e 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