Issue #18338: python --version now prints version string to stdout, and

serhiy-storchaka · serhiy-storchaka · commit e3ed4edb94ca · 2013-07-11T20:01:17.000+03:00
not to stderr.  Patch by Berker Peksag and Michael Dickens.
diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py
@@ -41,8 +41,10 @@ def test_usage(self):
 
     def test_version(self):
         version = ('Python %d.%d' % sys.version_info[:2]).encode("ascii")
-        rc, out, err = assert_python_ok('-V')
-        self.assertTrue(err.startswith(version))
+        for switch in '-V', '--version':
+            rc, out, err = assert_python_ok(switch)
+            self.assertFalse(err.startswith(version))
+            self.assertTrue(out.startswith(version))
 
     def test_verbose(self):
         # -v causes imports to write to stderr.  If the write to
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -10,6 +10,9 @@ What's New in Python 3.4.0 Alpha 1?
 Core and Builtins
 -----------------
 
+- Issue #18338: `python --version` now prints version string to stdout, and
+  not to stderr.  Patch by Berker Peksag and Michael Dickens.
+
 - Issue #18426: Fix NULL pointer dereference in C extension import when
   PyModule_GetDef() returns an error.
 
diff --git a/Modules/main.c b/Modules/main.c
@@ -500,7 +500,7 @@ Py_Main(int argc, wchar_t **argv)
         return usage(0, argv[0]);
 
     if (version) {
-        fprintf(stderr, "Python %s\n", PY_VERSION);
+        printf("Python %s\n", PY_VERSION);
         return 0;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -500,7 +500,7 @@ Py_Main(int argc, wchar_t **argv)`
`500`	`500`	`return usage(0, argv[0]);`
`501`	`501`
`502`	`502`	`if (version) {`
`503`		`- fprintf(stderr, "Python %s\n", PY_VERSION);`
	`503`	`+ printf("Python %s\n", PY_VERSION);`
`504`	`504`	`return 0;`
`505`	`505`	`}`
`506`	`506`