summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiampaolo Rodola' <g.rodola@gmail.com>2013-04-09 15:23:27 (GMT)
committerGiampaolo Rodola' <g.rodola@gmail.com>2013-04-09 15:23:27 (GMT)
commit0f344b6e0526245249b80219e6001616307d2b35 (patch)
treefcac81eda1a80570a03614d71366bd1295e58b07
parenta4c377cde9b010f6bee5e5e0a15e8545228d31e2 (diff)
parent7005b1f90a42c9187ff9b93a7be0244ef94af8a1 (diff)
downloadcpython-0f344b6e0526245249b80219e6001616307d2b35.zip
cpython-0f344b6e0526245249b80219e6001616307d2b35.tar.gz
cpython-0f344b6e0526245249b80219e6001616307d2b35.tar.bz2
merge heads
-rw-r--r--Lib/http/cookiejar.py2
-rw-r--r--Misc/NEWS3
2 files changed, 4 insertions, 1 deletions
diff --git a/Lib/http/cookiejar.py b/Lib/http/cookiejar.py
index 95f2f44..be828eb 100644
--- a/Lib/http/cookiejar.py
+++ b/Lib/http/cookiejar.py
@@ -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
diff --git a/Misc/NEWS b/Misc/NEWS
index 9569daf..7cc0e70 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -30,6 +30,9 @@ Core and Builtins
Library
-------
+- Issue #17678: Remove the use of deprecated method in http/cookiejar.py.
+ Changing the usage of get_origin_req_host() to origin_req_host.
+
- Issue #17666: Fix reading gzip files with an extra field.
- Issue #16475: Support object instancing, recursion and interned strings