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

benjamin.peterson python-checkins at python.org
Wed Nov 5 19:10:35 CET 2014


https://hg.python.org/cpython/rev/98ee59f61940
changeset: 93398:98ee59f61940
parent: 93396:826566b1b219
parent: 93397:ffa326335c4d
user: Benjamin Peterson <benjamin at python.org>
date: Wed Nov 05 13:10:16 2014 -0500
summary:
 merge 3.4
files:
 Lib/test/test_urllib2net.py | 12 ++----------
 1 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/Lib/test/test_urllib2net.py b/Lib/test/test_urllib2net.py
--- a/Lib/test/test_urllib2net.py
+++ b/Lib/test/test_urllib2net.py
@@ -8,13 +8,6 @@
 import urllib.request
 import sys
 
-try:
- import ssl
-except ImportError:
- ssl = None
-
-requires_ssl = unittest.skipIf(ssl is None, "SSL not supported")
-
 support.requires("network")
 
 TIMEOUT = 60 # seconds
@@ -167,14 +160,13 @@
 self.assertEqual(res.geturl(),
 "http://www.pythontest.net/index.html#frag")
 
- @requires_ssl
 def test_redirect_url_withfrag(self):
- redirect_url_with_frag = "http://bit.ly/1iSHToT"
+ redirect_url_with_frag = "http://www.pythontest.net/redir/with_frag/"
 with support.transient_internet(redirect_url_with_frag):
 req = urllib.request.Request(redirect_url_with_frag)
 res = urllib.request.urlopen(req)
 self.assertEqual(res.geturl(),
- "https://docs.python.org/3.4/glossary.html#term-global-interpreter-lock")
+ "http://www.pythontest.net/elsewhere/#frag")
 
 def test_custom_headers(self):
 url = "http://www.example.com"
-- 
Repository URL: https://hg.python.org/cpython


More information about the Python-checkins mailing list

AltStyle によって変換されたページ (->オリジナル) /