Commit 08114d40 authored by Georg Brandl's avatar Georg Brandl

changeset: 80007:49e4541f2aef

parent: 80003:be83cbf4a789
parent: 80006:32df036e6b75
user: Georg Brandl <georg@python.org>
date: Sun Oct 28 10:50:11 2012 +0100
summary: merge with 3.3
parent 61822667
...@@ -157,12 +157,12 @@ class OtherNetworkTests(unittest.TestCase): ...@@ -157,12 +157,12 @@ class OtherNetworkTests(unittest.TestCase):
## 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 = "http://docs.python.org/glossary.html#glossary" urlwith_frag = "http://docs.python.org/2/glossary.html#glossary"
with test_support.transient_internet(urlwith_frag): with test_support.transient_internet(urlwith_frag):
req = urllib2.Request(urlwith_frag) req = urllib2.Request(urlwith_frag)
res = urllib2.urlopen(req) res = urllib2.urlopen(req)
self.assertEqual(res.geturl(), self.assertEqual(res.geturl(),
"http://docs.python.org/glossary.html#glossary") "http://docs.python.org/2/glossary.html#glossary")
def test_fileno(self): def test_fileno(self):
req = urllib2.Request("http://www.python.org") req = urllib2.Request("http://www.python.org")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment