summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2012-10-28 09:51:46 (GMT)
committerGeorg Brandl <georg@python.org>2012-10-28 09:51:46 (GMT)
commit5b9561d1f1548787e518934aea02fad8a0391ab5 (patch)
tree3da1ab18bf0ee3949ed1d77eab5f2b47145d3436
parentc2415eb7e6ccb22888f35138527d6dc106e50a4e (diff)
parent579d5cd643d31b732e6e7707582276565e44ece9 (diff)
downloadcpython-5b9561d1f1548787e518934aea02fad8a0391ab5.zip
cpython-5b9561d1f1548787e518934aea02fad8a0391ab5.tar.gz
cpython-5b9561d1f1548787e518934aea02fad8a0391ab5.tar.bz2
merge with 3.2
-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 fc5527e..7f3c93a 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 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"