#17678: Remove the use of a deprecated method http/cookiejar.py. Changing the

usage of get_origin_req_host() to origin_req_host.

Patch by Wei-Cheng Pan

diff --cc Lib/http/cookiejar.py
Simple merge

diff --cc Misc/NEWS
index 9569dafbeed75a0c66295891a197c108f0016eeb,744c71518119d87021c9ae80384a599783b2bd07..7cc0e702539b2cbcd634e9210fd49358b64e1ebf
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -30,27 -21,68 +30,30 @@@ Core and Builtin
  Library
  -------
  
 -- Issue #17678: Fix DeprecationWarning in the http/cookiejar.py by changing the
 -  usage of get_origin_req_host() to origin_req_host.
++- 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 #17502: Process DEFAULT values in mock side_effect that returns iterator.
 -  Patch by Michael Foord.
 -
 -- Issue #17572: Avoid chained exceptions while passing bad directives to
 -  time.strptime().  Initial patch by Claudiu Popa.
 -
 -- Issue #17435: threading.Timer's __init__ method no longer uses mutable
 -  default values for the args and kwargs parameters.
 -
 -- Issue #17526: fix an IndexError raised while passing code without filename to
 -  inspect.findsource().  Initial patch by Tyler Doyle.
 -
 -IDLE
 -----
 -
 -- Issue #17657: Show full Tk version in IDLE's about dialog.
 -  Patch by Todd Rovito.
 -
 -- Issue #17613: Prevent traceback when removing syntax colorizer in IDLE.
 -
 -- Issue #1207589: Backwards-compatibility patch for right-click menu in IDLE.
 -
 -- Issue #16887: IDLE now accepts Cancel in tabify/untabify dialog box.
 -
 -- Issue #17625: In IDLE, close the replace dialog after it is used.
 -
 -- Issue #14254: IDLE now handles readline correctly across shell restarts.
 -
 -- Issue #17614: IDLE no longer raises exception when quickly closing a file.
 -
 -- Issue #6698: IDLE now opens just an editor window when configured to do so.
 -
 -- Issue #8900: Using keyboard shortcuts in IDLE to open a file no longer
 -  raises an exception.
 -
 -- Issue #6649: Fixed missing exit status in IDLE. Patch by Guilherme Polo.
 -
 -Documentation
 --------------
 -
 -- Issue #15940: Specify effect of locale on time functions.
 -
 +- Issue #16475: Support object instancing, recursion and interned strings
 +  in marshal
  
 -What's New in Python 3.3.1?
 -===========================
 +- Issue #17502: Process DEFAULT values in mock side_effect that returns iterator.
  
 -*Release date: 07-Apr-2013*
 +- Use the HTTPS PyPI url for upload, overriding any plain HTTP URL in pypirc.
  
 -Build
 ------
 +- Issue #16795: On the ast.arguments object, unify vararg with varargannotation
 +  and kwarg and kwargannotation. Change the column offset of ast.Attribute to be
 +  at the attribute name.
  
 -- Issue #17550: Fix the --enable-profiling configure switch.
 +- Issue #17434: Properly raise a SyntaxError when a string occurs between future
 +  imports.
  
 -Library
 --------
 +- Issue #17117: Import and @importlib.util.set_loader now set __loader__ when
 +  it has a value of None or the attribute doesn't exist.
  
 -- Issue #17625: In IDLE, close the replace dialog after it is used.
 +- Issue #17032: The "global" in the "NameError: global name 'x' is not defined"
 +  error message has been removed.  Patch by Ram Rachum.
  
  
  What's New in Python 3.3.1 release candidate 1?