[Python-checkins] cpython (merge 3.2 -> default): Merge from 3.2. 'idle_formatwarning' is the correct method name.

[senthil.kumaran]

http://hg.python.org/cpython/rev/0159624b1824
changeset:   71172:0159624b1824
parent:      71169:fbb1504a9275
parent:      71171:e9c406a53972
user:        Senthil Kumaran <senthil at uthcode.com>
date:        Sun Jul 03 17:40:39 2011 -0700
summary:
  Merge from 3.2.  'idle_formatwarning' is the correct method name.

files:
  Lib/idlelib/PyShell.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py
--- a/Lib/idlelib/PyShell.py
+++ b/Lib/idlelib/PyShell.py
@@ -59,7 +59,7 @@
             file = warning_stream
         try:
             file.write(warnings.formatwarning(message, category, filename,
-                                              lineno, file=file, line=line))
+                                              lineno, line=line))
         except IOError:
             pass  ## file (probably __stderr__) is invalid, warning dropped.
     warnings.showwarning = idle_showwarning

-- 
Repository URL: http://hg.python.org/cpython