From: Jeremy Hylton <jeremy@alum.mit.edu>
Date: Mon, 5 May 2003 04:10:40 +0000 (+0000)
Subject: Backport better fix for newurl as suggested by Jim Jewett in SF bug
X-Git-Tag: v2.2.3c1~44
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8a625c9b2cbf78e7e5c9aed98e56fb7f245c08cc;p=thirdparty%2FPython%2Fcpython.git

Backport better fix for newurl as suggested by Jim Jewett in SF bug
#730963.
---

diff --git a/Lib/urllib2.py b/Lib/urllib2.py
index e70b9e11e4e5..1c33eb058e13 100644
--- a/Lib/urllib2.py
+++ b/Lib/urllib2.py
@@ -406,7 +406,7 @@ class HTTPDefaultErrorHandler(BaseHandler):
         raise HTTPError(req.get_full_url(), code, msg, hdrs, fp)
 
 class HTTPRedirectHandler(BaseHandler):
-    def redirect_request(self, req, fp, code, msg, headers):
+    def redirect_request(self, req, fp, code, msg, headers, newurl):
         """Return a Request or None in response to a redirect.
 
         This is called by the http_error_30x methods when a redirection
@@ -442,7 +442,7 @@ class HTTPRedirectHandler(BaseHandler):
         # XXX Probably want to forget about the state of the current
         # request, although that might interact poorly with other
         # handlers that also use handler-specific request attributes
-        new = self.redirect_request(req, fp, code, msg, headers)
+        new = self.redirect_request(req, fp, code, msg, headers, newurl)
         if new is None:
             return