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)
commit579d5cd643d31b732e6e7707582276565e44ece9 (patch)
tree4d721098a32e21ae6332bbc84277456b2757e84a
parentfffc25da8388b4bcea4c81e1b3dff4e4f4e85b0a (diff)
downloadcpython-579d5cd643d31b732e6e7707582276565e44ece9.zip
cpython-579d5cd643d31b732e6e7707582276565e44ece9.tar.gz
cpython-579d5cd643d31b732e6e7707582276565e44ece9.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 5fcb4cb..e2b1d95 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"