[Python-checkins] cpython (merge 3.3 -> default): merge with 3.3
georg.brandl
python-checkins at python.org
Sun Oct 28 10:52:08 CET 2012
http://hg.python.org/cpython/rev/1ecef550d744
changeset: 80012:1ecef550d744
parent: 80008:72672cf5d850
parent: 80011:923ca6d73bad
user: Georg Brandl <georg at python.org>
date: Sun Oct 28 10:51:52 2012 +0100
summary:
merge with 3.3
files:
Lib/test/test_urllib2net.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Lib/test/test_urllib2net.py b/Lib/test/test_urllib2net.py
--- a/Lib/test/test_urllib2net.py
+++ b/Lib/test/test_urllib2net.py
@@ -157,12 +157,12 @@
## 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"
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list