From: Berker Peksag <berker.peksag@gmail.com>
Date: Sat, 12 Jul 2014 15:26:03 +0000 (+0300)
Subject: Issue #19076: Merge with 3.4.
X-Git-Tag: v3.5.0a1~1289
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=de1fb6660b212fc32e38119221a667188b907d67;p=python

Issue #19076: Merge with 3.4.
---

de1fb6660b212fc32e38119221a667188b907d67
diff --cc Misc/NEWS
index 6d790ad934,ecdb178984..ed3a4dc1bf
--- a/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