merge 3.4

diff --cc Misc/NEWS
index 80d66d006b196e4d76eb1ea7dc1a69f25c99c7f2,b32698535d1fb7f9d111cbeeb74dd7bed46c2d55..5a8d162c74427068837fe1366569929c71499eab
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -108,21 -27,11 +108,21 @@@ Core and Builtin
  Library
  -------
  
- - Issue 21044: tarfile.open() now handles fileobj with an integer 'name'
+ - Issue #21044: tarfile.open() now handles fileobj with an integer 'name'
    attribute.  Based on patch by Martin Panter.
  
 +- Issue #21966: Respect -q command-line option when code module is ran.
 +
  - Issue #19076: Don't pass the redundant 'file' argument to self.error().
  
 +- Issue #16382: Improve exception message of warnings.warn() for bad
 +  category. Initial patch by Phil Elson.
 +
 +- Issue #21932: os.read() now uses a :c:func:`Py_ssize_t` type instead of
 +  :c:type:`int` for the size to support reading more than 2 GB at once. On
 +  Windows, the size is truncted to INT_MAX. As any call to os.read(), the OS
 +  may read less bytes than the number of requested bytes.
 +
  - Issue #21942: Fixed source file viewing in pydoc's server mode on Windows.
  
  - Issue #11259: asynchat.async_chat().set_terminator() now raises a ValueError