#12448: merge with 3.2.

2 files changed, 4 insertions, 0 deletions

diff --git a/Lib/smtplib.py b/Lib/smtplib.py
index 68fc646..d37b0e2 100644
--- a/Lib/smtplib.py
+++ b/Lib/smtplib.py
@@ -940,6 +940,7 @@ if __name__ == '__main__':
 
     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
index abe2e23..375b945 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -311,6 +311,9 @@ Core and Builtins
 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).