From: Serhiy Storchaka <storchaka@gmail.com>
Date: Thu, 5 Sep 2013 14:44:53 +0000 (+0300)
Subject: Issue #18922: Now The Lib/smtpd.py and Tools/i18n/msgfmt.py scripts write
X-Git-Tag: v3.4.0a2~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c56894d305211c98882898f237ff54f620520139;p=thirdparty%2FPython%2Fcpython.git

Issue #18922: Now The Lib/smtpd.py and Tools/i18n/msgfmt.py scripts write
their version strings to stdout, and not to sderr.
---

diff --git a/Lib/smtpd.py b/Lib/smtpd.py
index f28036a5b4f2..1fa157ade7cc 100755
--- a/Lib/smtpd.py
+++ b/Lib/smtpd.py
@@ -780,7 +780,7 @@ def parseargs():
         if opt in ('-h', '--help'):
             usage(0)
         elif opt in ('-V', '--version'):
-            print(__version__, file=sys.stderr)
+            print(__version__)
             sys.exit(0)
         elif opt in ('-n', '--nosetuid'):
             options.setuid = 0
diff --git a/Misc/NEWS b/Misc/NEWS
index 8b6aa564f7c7..e325f371450a 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -214,6 +214,12 @@ Documentation
 - Issue #18783: Removed existing mentions of Python long type in docstrings,
   error messages and comments.
 
+Tools/Demos
+-----------
+
+- Issue #18922: Now The Lib/smtpd.py and Tools/i18n/msgfmt.py scripts write
+  their version strings to stdout, and not to sderr.
+
 
 What's New in Python 3.4.0 Alpha 1?
 ===================================
diff --git a/Tools/i18n/msgfmt.py b/Tools/i18n/msgfmt.py
index cd90691bf126..b0751a1ffc1d 100755
--- a/Tools/i18n/msgfmt.py
+++ b/Tools/i18n/msgfmt.py
@@ -218,7 +218,7 @@ def main():
         if opt in ('-h', '--help'):
             usage(0)
         elif opt in ('-V', '--version'):
-            print("msgfmt.py", __version__, file=sys.stderr)
+            print("msgfmt.py", __version__)
             sys.exit(0)
         elif opt in ('-o', '--output-file'):
             outfile = arg