mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

merge from 3.2

Browse source
This commit is contained in:
Senthil Kumaran 2011-04-13 07:24:32 +08:00
commit 1cea9a0227
4 changed files with 31 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Lib/urllib/request.py
View file

@ -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