summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2012-10-28 09:51:35 (GMT)
committerGeorg Brandl <georg@python.org>2012-10-28 09:51:35 (GMT)
commit08114d40e94fa97ac9a55b80b69dc269da904fcc (patch)
tree6ecab15983de8de79bddbc79bdcdfd74f286d9db
parent61822667dfb4d8e572d0f26a4618ca9b18f6f52b (diff)
downloadcpython-08114d40e94fa97ac9a55b80b69dc269da904fcc.zip
cpython-08114d40e94fa97ac9a55b80b69dc269da904fcc.tar.gz
cpython-08114d40e94fa97ac9a55b80b69dc269da904fcc.tar.bz2
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
-rw-r--r--Lib/test/test_urllib2net.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/test_urllib2net.py b/Lib/test/test_urllib2net.py
index dcdbfe8..4d73ac0 100644
--- a/Lib/test/test_urllib2net.py
+++ b/Lib/test/test_urllib2net.py
@@ -157,12 +157,12 @@ class OtherNetworkTests(unittest.TestCase):
## self._test_urls(urls, self._extra_handlers()+[bauth, dauth])
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):
req = urllib2.Request(urlwith_frag)
res = urllib2.urlopen(req)
self.assertEqual(res.geturl(),
- "http://docs.python.org/glossary.html#glossary")
+ "http://docs.python.org/2/glossary.html#glossary")
def test_fileno(self):
req = urllib2.Request("http://www.python.org")