diff options
Diffstat (limited to 'Lib/http/cookiejar.py')
| -rw-r--r-- | Lib/http/cookiejar.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Lib/http/cookiejar.py b/Lib/http/cookiejar.py index b6cfc355c9..9fcd4c6f46 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:] @@ -704,7 +704,7 @@ def is_third_party(request): """ req_host = request_host(request) - if not domain_match(req_host, reach(request.get_origin_req_host())): + if not domain_match(req_host, reach(request.origin_req_host)): return True else: return False @@ -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 @@ -1981,7 +1981,7 @@ class MozillaCookieJar(FileCookieJar): magic_re = re.compile("#( Netscape)? HTTP Cookie File") header = """\ # Netscape HTTP Cookie File -# http://www.netscape.com/newsref/std/cookie_spec.html +# http://curl.haxx.se/rfc/cookie_spec.html # This is a generated file! Do not edit. """ |