summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSenthil Kumaran <orsenthil@gmail.com>2011-04-12 23:24:32 (GMT)
committerSenthil Kumaran <orsenthil@gmail.com>2011-04-12 23:24:32 (GMT)
commit1cea9a0227213d1ad914e1d6ce69acf5792756f5 (patch)
tree4a8f8b0eecd8f701f7d75820cc8063b064fed7b0
parent1f817f7eb7edeae05b2ec641b235776c0507be5d (diff)
parentb17abb1af9e36c728e4fc9e27a9fd9441d3f77a2 (diff)
downloadcpython-1cea9a0227213d1ad914e1d6ce69acf5792756f5.zip
cpython-1cea9a0227213d1ad914e1d6ce69acf5792756f5.tar.gz
cpython-1cea9a0227213d1ad914e1d6ce69acf5792756f5.tar.bz2
merge from 3.2
-rw-r--r--Lib/test/test_urllib.py10
-rw-r--r--Lib/test/test_urllib2.py15
-rw-r--r--Lib/test/test_urllib2net.py2
-rw-r--r--Lib/urllib/request.py9
4 files changed, 31 insertions, 5 deletions
diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py
index b85005f..526760d 100644
--- a/Lib/test/test_urllib.py
+++ b/Lib/test/test_urllib.py
@@ -175,6 +175,16 @@ class urlopen_HttpTests(unittest.TestCase):
finally:
self.unfakehttp()
+ def test_url_fragment(self):
+ # Issue #11703: geturl() omits fragments in the original URL.
+ url = 'http://docs.python.org/library/urllib.html#OK'
+ self.fakehttp(b"HTTP/1.1 200 OK\r\n\r\nHello!")
+ try:
+ fp = urllib.request.urlopen(url)
+ self.assertEqual(fp.geturl(), url)
+ finally:
+ self.unfakehttp()
+
def test_willclose(self):
self.fakehttp(b"HTTP/1.1 200 OK\r\n\r\nHello!")
try:
diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py
index 113c10d..b6e4e91 100644
--- a/Lib/test/test_urllib2.py
+++ b/Lib/test/test_urllib2.py
@@ -1070,6 +1070,15 @@ class HandlerTests(unittest.TestCase):
o.open("http://www.example.com/")
self.assertFalse(hh.req.has_header("Cookie"))
+ def test_redirect_fragment(self):
+ redirected_url = 'http://www.example.com/index.html#OK\r\n\r\n'
+ hh = MockHTTPHandler(302, 'Location: ' + redirected_url)
+ hdeh = urllib.request.HTTPDefaultErrorHandler()
+ hrh = urllib.request.HTTPRedirectHandler()
+ o = build_test_opener(hh, hdeh, hrh)
+ fp = o.open('http://www.example.com')
+ self.assertEqual(fp.geturl(), redirected_url.strip())
+
def test_proxy(self):
o = OpenerDirector()
ph = urllib.request.ProxyHandler(dict(http="proxy.example.com:3128"))
@@ -1385,12 +1394,16 @@ class RequestTests(unittest.TestCase):
req = Request("<URL:http://www.python.org>")
self.assertEqual("www.python.org", req.get_host())
- def test_urlwith_fragment(self):
+ def test_url_fragment(self):
req = Request("http://www.python.org/?qs=query#fragment=true")
self.assertEqual("/?qs=query", req.get_selector())
req = Request("http://www.python.org/#fun=true")
self.assertEqual("/", req.get_selector())
+ # Issue 11703: geturl() omits fragment in the original URL.
+ url = 'http://docs.python.org/library/urllib2.html#OK'
+ req = Request(url)
+ self.assertEqual(req.get_full_url(), url)
def test_main(verbose=None):
from test import test_urllib2
diff --git a/Lib/test/test_urllib2net.py b/Lib/test/test_urllib2net.py
index eab1573..7ca6119 100644
--- a/Lib/test/test_urllib2net.py
+++ b/Lib/test/test_urllib2net.py
@@ -159,7 +159,7 @@ class OtherNetworkTests(unittest.TestCase):
req = urllib.request.Request(urlwith_frag)
res = urllib.request.urlopen(req)
self.assertEqual(res.geturl(),
- "http://docs.python.org/glossary.html")
+ "http://docs.python.org/glossary.html#glossary")
def test_custom_headers(self):
url = "http://www.example.com"
diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py
index 304bf59..c80b7d1 100644
--- a/Lib/urllib/request.py
+++ b/Lib/urllib/request.py
@@ -180,7 +180,7 @@ class Request:
origin_req_host=None, unverifiable=False):
# unwrap('<URL:type://host/path>') --> 'type://host/path'
self.full_url = unwrap(url)
- self.full_url, fragment = splittag(self.full_url)
+ self.full_url, self.fragment = splittag(self.full_url)
self.data = data
self.headers = {}
self._tunnel_host = None
@@ -219,7 +219,10 @@ class Request:
return self.data
def get_full_url(self):
- return self.full_url
+ if self.fragment:
+ return '%s#%s' % (self.full_url, self.fragment)
+ else:
+ return self.full_url
def get_type(self):
return self.type
@@ -1135,7 +1138,7 @@ class AbstractHTTPHandler(BaseHandler):
except socket.error as err:
raise URLError(err)
- r.url = req.full_url
+ r.url = req.get_full_url()
# This line replaces the .msg attribute of the HTTPResponse
# with .headers, because urllib clients expect the response to
# have the reason in .msg. It would be good to mark this