[Python-checkins] cpython (merge 3.2 -> default): #12448: merge with 3.2.

[ezio.melotti]

http://hg.python.org/cpython/rev/e08397a5537a
changeset:   72971:e08397a5537a
parent:      72968:7e57c95898d3
parent:      72970:2c50343d0500
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Tue Oct 18 13:26:49 2011 +0300
summary:
  #12448: merge with 3.2.

files:
  Lib/smtplib.py |  1 +
  Misc/NEWS      |  3 +++
  2 files changed, 4 insertions(+), 0 deletions(-)


diff --git a/Lib/smtplib.py b/Lib/smtplib.py
--- a/Lib/smtplib.py
+++ b/Lib/smtplib.py
@@ -940,6 +940,7 @@
 
     def prompt(prompt):
         sys.stdout.write(prompt + ": ")
+        sys.stdout.flush()
         return sys.stdin.readline().strip()
 
     fromaddr = prompt("From")
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -311,6 +311,9 @@
 Library
 -------
 
+- Issue #12448: smtplib now flushes stdout while running ``python -m smtplib``
+  in order to display the prompt correctly.
+
 - Issue #12454: The mailbox module is now using ASCII, instead of the locale
   encoding, to read and write MH mailboxes (.mh_sequences files).
 

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