Fix and check cgi module deprecation warnings. Revert an unwanted rename in test_import.
diff --git a/Lib/cgi.py b/Lib/cgi.py
index db10a62..310dc02 100755
--- a/Lib/cgi.py
+++ b/Lib/cgi.py
@@ -45,10 +45,10 @@
with catch_warnings():
if sys.py3kwarning:
filterwarnings("ignore", ".*mimetools has been removed",
- DeprecationWarning)
+ DeprecationWarning)
+ filterwarnings("ignore", ".*rfc822 has been removed",
+ DeprecationWarning)
import mimetools
- if sys.py3kwarning:
- filterwarnings("ignore", ".*rfc822 has been removed", DeprecationWarning)
import rfc822
try:
@@ -180,8 +180,8 @@
def parse_qs(qs, keep_blank_values=0, strict_parsing=0):
"""Parse a query given as a string argument."""
- warn("cgi.parse_qs is deprecated, use urlparse.parse_qs \
- instead", PendingDeprecationWarning, 2)
+ warn("cgi.parse_qs is deprecated, use urlparse.parse_qs instead",
+ PendingDeprecationWarning, 2)
return urlparse.parse_qs(qs, keep_blank_values, strict_parsing)
diff --git a/Lib/test/test_cgi.py b/Lib/test/test_cgi.py
index c5e07a0..791553b 100644
--- a/Lib/test/test_cgi.py
+++ b/Lib/test/test_cgi.py
@@ -4,7 +4,6 @@
import sys
import tempfile
import unittest
-from StringIO import StringIO
class HackedSysModule:
# The regression test will have real values in sys.argv, which
@@ -340,14 +339,16 @@
self.assertEqual(result, v)
def test_deprecated_parse_qs(self):
- with check_warnings(quiet=False):
- # this func is moved to urlparse, this is just a sanity check
+ # this func is moved to urlparse, this is just a sanity check
+ with check_warnings(('cgi.parse_qs is deprecated, use urlparse.'
+ 'parse_qs instead', PendingDeprecationWarning)):
self.assertEqual({'a': ['A1'], 'B': ['B3'], 'b': ['B2']},
cgi.parse_qs('a=A1&b=B2&B=B3'))
def test_deprecated_parse_qsl(self):
- with check_warnings(quiet=False):
- # this func is moved to urlparse, this is just a sanity check
+ # this func is moved to urlparse, this is just a sanity check
+ with check_warnings(('cgi.parse_qsl is deprecated, use urlparse.'
+ 'parse_qsl instead', PendingDeprecationWarning)):
self.assertEqual([('a', 'A1'), ('b', 'B2'), ('B', 'B3')],
cgi.parse_qsl('a=A1&b=B2&B=B3'))
diff --git a/Lib/test/test_import.py b/Lib/test/test_import.py
index 44594d8..f47c6c9 100644
--- a/Lib/test/test_import.py
+++ b/Lib/test/test_import.py
@@ -162,7 +162,7 @@
unlink(filename + 'c')
unlink(filename + 'o')
- def test_0Bfailing_import_sticks(self):
+ def test_failing_import_sticks(self):
source = TESTFN + os.extsep + "py"
with open(source, "w") as f:
print >> f, "a = 1 // 0"