[Python-checkins] cpython (merge default -> default): merge heads

[giampaolo.rodola]

http://hg.python.org/cpython/rev/b7f2d28260b4
changeset:   83214:b7f2d28260b4
parent:      83213:37c31fa0c47d
parent:      83212:79387f3bcc92
user:        Giampaolo Rodola' <g.rodola at gmail.com>
date:        Tue Apr 09 17:23:27 2013 +0200
summary:
  merge heads

files:
  Lib/http/cookiejar.py |  2 +-
  Misc/NEWS             |  3 +++
  2 files changed, 4 insertions(+), 1 deletions(-)


diff --git a/Lib/http/cookiejar.py b/Lib/http/cookiejar.py
--- a/Lib/http/cookiejar.py
+++ b/Lib/http/cookiejar.py
@@ -704,7 +704,7 @@
 
     """
     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
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -30,6 +30,9 @@
 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

-- 
Repository URL: http://hg.python.org/cpython