Issue #19076: Merge with 3.4.

2 files changed, 3 insertions, 1 deletions

diff --git a/Lib/pdb.py b/Lib/pdb.py
index dd7ceb8..42e605e 100755
--- a/Lib/pdb.py
+++ b/Lib/pdb.py
@@ -673,7 +673,7 @@ class Pdb(bdb.Bdb, cmd.Cmd):
             # 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
index 6d790ad..ed3a4dc 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -108,6 +108,8 @@ Core and Builtins
 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.