Merge with 3.3

diff --cc Misc/NEWS
index c20a50b1a27a936e4b22c38a38fdec9c8973db62,aacf0e62a938ee5d539507528a6127f5a8bc6c56..c431eeecc64564189e6c4803414655d9fbdb0330
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -342,51 -270,60 +342,54 @@@ Librar
  - Issue #14971: unittest test discovery no longer gets confused when a function
    has a different __name__ than its name in the TestCase class dictionary.
  
 -- Issue #17678: Fix DeprecationWarning in the http/cookiejar.py by changing the
 -  usage of get_origin_req_host() to origin_req_host.
 +- Issue #17487: The wave getparams method now returns a namedtuple rather than
 +  a plain tuple.
  
 -- 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 #17675: socket repr() provides local and remote addresses (if any).
 +  Patch by Giampaolo Rodola'
  
 -- Issue #17572: Avoid chained exceptions while passing bad directives to
 -  time.strptime().  Initial patch by Claudiu Popa.
 +- Issue #17093: Make the ABCs in importlib.abc provide default values or raise
 +  reasonable exceptions for their methods to make them more amenable to super()
 +  calls.
  
 -- Issue #17435: threading.Timer's __init__ method no longer uses mutable
 -  default values for the args and kwargs parameters.
 +- Issue #17566: Make importlib.abc.Loader.module_repr() optional instead of an
 +  abstractmethod and raising NotImplementedError so as to be ignored by default.
  
 -- Issue #17526: fix an IndexError raised while passing code without filename to
 -  inspect.findsource().  Initial patch by Tyler Doyle.
 -
 -- Issue #16550: Update the opcode descriptions of pickletools to use unsigned
 -  integers where appropriate.  Initial patch by Serhiy Storchaka.
 -
 -IDLE
 -----
 -
 -- Issue #17838: Allow sys.stdin to be reassigned.
 +- 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 #13495: Avoid loading the color delegator twice in IDLE.
 -
 -- Issue #17798: Allow IDLE to edit new files when specified on command line.
 -
 -- Issue #14735: Update IDLE docs to omit "Control-z on Windows".
 +- Issue #17666: Fix reading gzip files with an extra field.
  
 -- Issue #17585: Fixed IDLE regression. Now closes when using exit() or quit().
 +- Issue #16475: Support object instancing, recursion and interned strings
 +  in marshal
  
 -- Issue #17657: Show full Tk version in IDLE's about dialog.
 -  Patch by Todd Rovito.
 +- Issue #17502: Process DEFAULT values in mock side_effect that returns iterator.
  
 -- Issue #17613: Prevent traceback when removing syntax colorizer in IDLE.
 +- 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 #1207589: Backwards-compatibility patch for right-click menu in IDLE.
 +- Issue #17434: Properly raise a SyntaxError when a string occurs between future
 +  imports.
  
 -- Issue #16887: IDLE now accepts Cancel in tabify/untabify dialog box.
 +- 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.
  
 -- Issue #14254: IDLE now handles readline correctly across shell restarts.
 +- Issue #18080: When building a C extension module on OS X, if the compiler
 +  is overriden with the CC environment variable, use the new compiler as
 +  the default for linking if LDSHARED is not also overriden.  This restores
 +  Distutils behavior introduced in 3.2.3 and inadvertently dropped in 3.3.0.
  
 -- Issue #17614: IDLE no longer raises exception when quickly closing a file.
++- Issue #18113: Fixed a refcount leak in the curses.panel module's
++  set_userptr() method.  Reported by Atsuo Ishimoto.
+ 
 -- Issue #6698: IDLE now opens just an editor window when configured to do so.
 +- Implement PEP 443 "Single-dispatch generic functions".
  
 -- Issue #8900: Using keyboard shortcuts in IDLE to open a file no longer
 -  raises an exception.
 +- Implement PEP 435 "Adding an Enum type to the Python standard library".
  
 -- Issue #6649: Fixed missing exit status in IDLE. Patch by Guilherme Polo.
  
  Tests
  -----