From da1ffbc4eecb53d21b0a25fda9aa8989cbd7463b Mon Sep 17 00:00:00 2001 From: Meador Inge Date: Fri, 20 Jul 2012 19:12:04 -0500 Subject: Issue #15409: Replace use of deprecated urllib.request.Request methods in http.cookijar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Patch by Flávio Ribeiro. --- Lib/http/cookiejar.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Lib/http/cookiejar.py b/Lib/http/cookiejar.py index a516d73..8f3f6dc 100644 --- a/Lib/http/cookiejar.py +++ b/Lib/http/cookiejar.py @@ -625,7 +625,7 @@ def request_path(request): return path def request_port(request): - host = request.get_host() + host = request.host i = host.find(':') if i >= 0: port = host[i+1:] @@ -949,7 +949,7 @@ class DefaultCookiePolicy(CookiePolicy): return True def set_ok_verifiability(self, cookie, request): - if request.is_unverifiable() and is_third_party(request): + if request.unverifiable and is_third_party(request): if cookie.version > 0 and self.strict_rfc2965_unverifiable: _debug(" third-party RFC 2965 cookie during " "unverifiable transaction") @@ -1088,7 +1088,7 @@ class DefaultCookiePolicy(CookiePolicy): return True def return_ok_verifiability(self, cookie, request): - if request.is_unverifiable() and is_third_party(request): + if request.unverifiable and is_third_party(request): if cookie.version > 0 and self.strict_rfc2965_unverifiable: _debug(" third-party RFC 2965 cookie during unverifiable " "transaction") @@ -1100,7 +1100,7 @@ class DefaultCookiePolicy(CookiePolicy): return True def return_ok_secure(self, cookie, request): - if cookie.secure and request.get_type() != "https": + if cookie.secure and request.type != "https": _debug(" secure cookie with non-secure request") return False return True -- cgit v0.12