merge 3.3 (#17625)

diff --cc Misc/NEWS
index d1a56a6652aca364fde66d46e87376e136592f84,6014d2e14f0a34cdaa0973909d1d926a2d0ccd67..d72e8bb9bb730e60d7eda14e8f8fd429a3a6e359
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -12,35 -14,48 +12,37 @@@ Core and Builtin
  
  - Issue #17619: Make input() check for Ctrl-C correctly on Windows.
  
 -- Issue #17610: Don't rely on non-standard behavior of the C qsort() function.
 -
 -- Issue #17357: Add missing verbosity output when using -v/-vv.
 +- Issue #17357: Add missing verbosity messages for -v/-vv that were lost during
 +  the importlib transition.
  
 -Library
 --------
 -
 -- Issue #17572: Avoid chained exceptions while passing bad directives to
 -  time.strptime().  Initial patch by Claudiu Popa.
 -
 -- 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 #17610: Don't rely on non-standard behavior of the C qsort() function.
  
 -- Issue #6698: IDLE now opens just an editor window when configured to do so.
 +- Issue #17323: The "[X refs, Y blocks]" printed by debug builds has been
 +  disabled by default.  It can be re-enabled with the `-X showrefcount` option.
  
 -- Issue #8900: Using keyboard shortcuts in IDLE to open a file no longer
 -  raises an exception.
 +- Issue #17522: Add the PyGILState_Check() API.
  
 -- Issue #6649: Fixed missing exit status in IDLE. Patch by Guilherme Polo.
 -
 -- Issue #17435: threading.Timer's __init__ method no longer uses mutable
 -  default values for the args and kwargs parameters.
 +- Issue #16475: Support object instancing, recursion and interned strings
 +  in marshal
  
 -- Issue #17526: fix an IndexError raised while passing code without filename to
 -  inspect.findsource().  Initial patch by Tyler Doyle.
 +- Use the HTTPS PyPI url for upload, overriding any plain HTTP URL in pypirc.
  
 -Documentation
 --------------
++- Issue #17625: In IDLE, close the replace dialog after it is used.
+ 
 -- Issue #15940: Specify effect of locale on time functions.
 +- 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 #17434: Properly raise a SyntaxError when a string occurs between future
 +  imports.
  
 -What's New in Python 3.3.1?
 -===========================
 +- Issue #17117: Import and @importlib.util.set_loader now set __loader__ when
 +  it has a value of None or the attribute doesn't exist.
  
 -*Release date: 07-Apr-2013*
 +- Issue #17327: Add PyDict_SetDefault.
  
 -Core and Builtins
 ------------------
 +- Issue #17032: The "global" in the "NameError: global name 'x' is not defined"
 +  error message has been removed.  Patch by Ram Rachum.
  
  - Issue #17328: Fix possible refleak in dict.setdefault.