summaryrefslogtreecommitdiff
path: root/Lib/test/test_urllib.py
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2013-02-21 02:41:42 +0200
committerEzio Melotti <ezio.melotti@gmail.com>2013-02-21 02:41:42 +0200
commit434ad0e917c062403319064603301ce06511759d (patch)
treef242537ad7225a9028b05cdb1a293556c66da224 /Lib/test/test_urllib.py
parent86e75286c92e7d1098cec5170b3aff082e587736 (diff)
downloadcpython-434ad0e917c062403319064603301ce06511759d.tar.gz
Silence DeprecationWarnings in test_urllib.
Diffstat (limited to 'Lib/test/test_urllib.py')
-rw-r--r--Lib/test/test_urllib.py23
1 files changed, 14 insertions, 9 deletions
diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py
index 52e7749d89..4f71b24a08 100644
--- a/Lib/test/test_urllib.py
+++ b/Lib/test/test_urllib.py
@@ -30,7 +30,10 @@ def urlopen(url, data=None, proxies=None):
if proxies is not None:
opener = urllib.request.FancyURLopener(proxies=proxies)
elif not _urlopener:
- opener = urllib.request.FancyURLopener()
+ with support.check_warnings(
+ ('FancyURLopener style of invoking requests is deprecated.',
+ DeprecationWarning)):
+ opener = urllib.request.FancyURLopener()
_urlopener = opener
else:
opener = _urlopener
@@ -1196,14 +1199,16 @@ class URLopener_Tests(unittest.TestCase):
class DummyURLopener(urllib.request.URLopener):
def open_spam(self, url):
return url
-
- self.assertEqual(DummyURLopener().open(
- 'spam://example/ /'),'//example/%20/')
-
- # test the safe characters are not quoted by urlopen
- self.assertEqual(DummyURLopener().open(
- "spam://c:|windows%/:=&?~#+!$,;'@()*[]|/path/"),
- "//c:|windows%/:=&?~#+!$,;'@()*[]|/path/")
+ with support.check_warnings(
+ ('DummyURLopener style of invoking requests is deprecated.',
+ DeprecationWarning)):
+ self.assertEqual(DummyURLopener().open(
+ 'spam://example/ /'),'//example/%20/')
+
+ # test the safe characters are not quoted by urlopen
+ self.assertEqual(DummyURLopener().open(
+ "spam://c:|windows%/:=&?~#+!$,;'@()*[]|/path/"),
+ "//c:|windows%/:=&?~#+!$,;'@()*[]|/path/")
# Just commented them out.
# Can't really tell why keep failing in windows and sparc.