[Python-checkins] cpython (merge 3.4 -> default): Issue #19076: Merge with 3.4.
berker.peksag
python-checkins at python.org
Sat Jul 12 17:26:05 CEST 2014
http://hg.python.org/cpython/rev/d891ad8aeb80
changeset: 91661:d891ad8aeb80
parent: 91659:880e2cdac8b1
parent: 91660:afa9c0e24a71
user: Berker Peksag <berker.peksag at gmail.com>
date: Sat Jul 12 18:26:03 2014 +0300
summary:
Issue #19076: Merge with 3.4.
files:
Lib/pdb.py | 2 +-
Misc/NEWS | 2 ++
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/Lib/pdb.py b/Lib/pdb.py
--- a/Lib/pdb.py
+++ b/Lib/pdb.py
@@ -673,7 +673,7 @@
# now set the break point
err = self.set_break(filename, line, temporary, cond, funcname)
if err:
- self.error(err, file=self.stdout)
+ self.error(err)
else:
bp = self.get_breaks(filename, line)[-1]
self.message("Breakpoint %d at %s:%d" %
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -108,6 +108,8 @@
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.
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list