merge 3.2

This commit is contained in:
Benjamin Peterson 2014-03-31 13:46:26 -04:00
commit b25e3f9e6a

View file

@ -155,12 +155,12 @@ class OtherNetworkTests(unittest.TestCase):
## self._test_urls(urls, self._extra_handlers()+[bauth, dauth])
def test_urlwithfrag(self):
urlwith_frag = "http://docs.python.org/2/glossary.html#glossary"
urlwith_frag = "https://docs.python.org/2/glossary.html#glossary"
with support.transient_internet(urlwith_frag):
req = urllib.request.Request(urlwith_frag)
res = urllib.request.urlopen(req)
self.assertEqual(res.geturl(),
"http://docs.python.org/2/glossary.html#glossary")
"https://docs.python.org/2/glossary.html#glossary")
def test_custom_headers(self):
url = "http://www.example.com"