changeset:   91661:d891ad8aeb80
parent:      91659:880e2cdac8b1
parent:      91660:afa9c0e24a71
user:        Berker Peksag <berker.peksag@gmail.com>
date:        Sat Jul 12 18:26:03 2014 +0300
files:       Misc/NEWS
description:
Issue #19076: Merge with 3.4.


diff -r 880e2cdac8b1 -r d891ad8aeb80 Lib/pdb.py
--- a/Lib/pdb.py	Sat Jul 12 11:03:53 2014 +0200
+++ b/Lib/pdb.py	Sat Jul 12 18:26:03 2014 +0300
@@ -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 -r 880e2cdac8b1 -r d891ad8aeb80 Misc/NEWS
--- a/Misc/NEWS	Sat Jul 12 11:03:53 2014 +0200
+++ b/Misc/NEWS	Sat Jul 12 18:26:03 2014 +0300
@@ -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.