diff options
author | Senthil Kumaran <orsenthil@gmail.com> | 2011-04-12 23:24:32 (GMT) |
---|---|---|
committer | Senthil Kumaran <orsenthil@gmail.com> | 2011-04-12 23:24:32 (GMT) |
commit | 1cea9a0227213d1ad914e1d6ce69acf5792756f5 (patch) | |
tree | 4a8f8b0eecd8f701f7d75820cc8063b064fed7b0 /Lib/urllib | |
parent | 1f817f7eb7edeae05b2ec641b235776c0507be5d (diff) | |
parent | b17abb1af9e36c728e4fc9e27a9fd9441d3f77a2 (diff) | |
download | cpython-1cea9a0227213d1ad914e1d6ce69acf5792756f5.zip cpython-1cea9a0227213d1ad914e1d6ce69acf5792756f5.tar.gz cpython-1cea9a0227213d1ad914e1d6ce69acf5792756f5.tar.bz2 |
merge from 3.2
Diffstat (limited to 'Lib/urllib')
-rw-r--r-- | Lib/urllib/request.py | 9 |
1 files changed, 6 insertions, 3 deletions
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 |