merge 3.2

This commit is contained in:
Benjamin Peterson 2014-11-05 11:29:39 -05:00
commit e71abcc7bb
1 changed files with 2 additions and 2 deletions

View File

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