Issue #18676: Merge from 3.3

diff --cc Misc/ACKS
index 771794188462be07a54df281f370a8ba043072e6,349c70e2db6c03ccbd6d3b8fa06ea8e26a206f50..be7abdbbf4059af3e347bfcc096f9d8f71b157f8
--- 1/Misc/ACKS
--- 2/Misc/ACKS
+++ b/Misc/ACKS
@@@ -773,8 -753,8 +773,9 @@@ Ray Loyzag
  Lukas Lueg
  Loren Luke
  Fredrik Lundh
+ Zhongyue Luo
  Mark Lutz
 +Taras Lyapun
  Jim Lynch
  Mikael Lyngvig
  Martin von Löwis

diff --cc Misc/NEWS
index 5c734798f7ca84f0ed6498b3a2425a1c60b715dc,4401418d76578ad39c1c0727ec6cd9dbca990c0b..dededc7df27b8ef37991eb709d60c93d592626af
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,43 -12,8 +10,46 @@@ Projected Release date: 2013-09-0
  Core and Builtins
  -----------------
  
 +- Issue #16499: Add command line option for isolated mode.
 +
 +- Issue #15301: Parsing fd, uid, and gid parameters for builtins
 +  in Modules/posixmodule.c is now far more robust.
 +
  - Issue #18368: PyOS_StdioReadline() no longer leaks memory when realloc()
 -  fails.
 +  fail.
 +
 +- Issue #17934: Add a clear() method to frame objects, to help clean up
 +  expensive details (local variables) and break reference cycles.
 +
 +Library
 +-------
 +
++- Issue #18676: Change 'positive' to 'non-negative' in queue.py put and get
++  docstrings and ValueError messages. Patch by Zhongyue Luo
++
 +- Issue #8112: xlmrpc.server's DocXMLRPCServer server no longer raises an error
 +  if methods have annotations; it now correctly displays the annotations.
 +
 +- Issue #18600: Added policy argument to email.message.Message.as_string,
 +  and as_bytes and __bytes__ methods to Message.
 +
 +- Issue #18671: Output more information when logging exceptions occur.
 +
 +- Issue #18621: Prevent the site module's patched builtins from keeping
 +  too many references alive for too long.
 +
 +- Issue #4885: Add weakref support to mmap objects.  Patch by Valerie Lambert.
 +
 +- Issue #8860: Fixed rounding in timedelta constructor.
 +
 +
 +What's New in Python 3.4.0 Alpha 1?
 +===================================
 +
 +Release date: 2013-08-03
 +
 +Core and Builtins
 +-----------------
  
  - Issue #16741: Fix an error reporting in int().
  
@@@ -821,42 -581,27 +824,42 @@@ Window
  Build
  -----
  
- - Issue #16067: Add description into MSI file to replace installer's 
 -- Issue #17547: In configure, explicitly pass -Wformat for the benefit for GCC
 -  4.8.
++- Issue #16067: Add description into MSI file to replace installer's
 +  temporary name.
  
 -- Issue #17962: Build with OpenSSL 1.0.1e on Windows.
 +- Issue #18257: Fix readlink usage in python-config.  Install the python
 +  version again on Darwin.
  
 +- Issue #18481: Add C coverage reporting with gcov and lcov. A new make target
 +  "coverage-report" creates an instrumented Python build, runs unit tests
 +  and creates a HTML. The report can be updated with "make coverage-lcov".
  
 -What's New in Python 3.3.1?
 -===========================
 +- Issue #17845: Clarified the message printed when some module are not built.
  
 -*Release date: 07-Apr-2013*
 +- Issue #18256: Compilation fix for recent AIX releases.  Patch by
 +  David Edelsohn.
  
 -Build
 ------
 +- Issue #17547: In configure, explicitly pass -Wformat for the benefit for GCC
 +  4.8.
  
 -- Issue #17550: Fix the --enable-profiling configure switch.
 +- Issue #15172: Document NASM 2.10+ as requirement for building OpenSSL 1.0.1
 +  on Windows.
  
 -IDLE
 --------
 +Tools/Demos
 +-----------
  
 -- Issue #17625: In IDLE, close the replace dialog after it is used.
 +- Issue #18439: Make patchcheck work on Windows for ACKS, NEWS.
 +
 +- Issue #18448: Fix a typo in Tools/demo/eiffel.py.
 +
 +- Issue #18457: Fixed saving of formulas and complex numbers in
 +  Tools/demo/ss1.py.
 +
 +- Issue #18449: Make Tools/demo/ss1.py work again on Python 3.  Patch by
 +  Févry Thibault.
  
 +- Issue #12990: The "Python Launcher" on OSX could not launch python scripts
 +  that have paths that include wide characters.
  
  What's New in Python 3.3.1 release candidate 1?
  ===============================================