summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2012-10-28 10:51:35 +0100
committerGeorg Brandl <georg@python.org>2012-10-28 10:51:35 +0100
commit124a00f688ecef4a476d3bdf7003779c73ade64e (patch)
tree9646c214a75657b31b0b93d7d3a95134ff2a059c
parent0645430ead015e24ba1dd5cfaafb22051a4d335a (diff)
downloadcpython-124a00f688ecef4a476d3bdf7003779c73ade64e.tar.gz
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 5fcb4cbca2..e2b1d95c04 100644
--- a/Lib/test/test_urllib2net.py
+++ b/Lib/test/test_urllib2net.py
@@ -156,12 +156,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 support.transient_internet(urlwith_frag):
req = urllib.request.Request(urlwith_frag)
res = urllib.request.urlopen(req)
self.assertEqual(res.geturl(),
- "http://docs.python.org/glossary.html#glossary")
+ "http://docs.python.org/2/glossary.html#glossary")
def test_custom_headers(self):
url = "http://www.example.com"