Issue #19076: Merge with 3.4.

diff --cc Misc/NEWS
index 6d790ad9345a9efa006ba28f6a857f8f792a717a,ecdb17898406e282c0b34382bcf3ab664067faea..ed3a4dc1bfa90f74a14a88a8128250d9c86f9770
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -108,14 -27,8 +108,16 @@@ Core and Builtin
  Library
  -------
  
+ - 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