[pypy-svn] r60921 - in pypy/trunk/pypy: module/sys translator/goal

[cfbolz at codespeak.net]

Author: cfbolz
Date: Tue Jan 13 15:59:23 2009
New Revision: 60921

Modified:
   pypy/trunk/pypy/module/sys/version.py
   pypy/trunk/pypy/translator/goal/app_main.py
Log:
(arigo, cfbolz): Make -V output comply more to CPython's to fix a test.
Nicefication in sys module.


Modified: pypy/trunk/pypy/module/sys/version.py
==============================================================================
--- pypy/trunk/pypy/module/sys/version.py	(original)
+++ pypy/trunk/pypy/module/sys/version.py	Tue Jan 13 15:59:23 2009
@@ -35,7 +35,7 @@
     return space.wrap(CPYTHON_VERSION)
 
 def get_version(space):
-        return space.wrap("%d.%d.%d (%d, %s, %s) \n[PyPy %d.%d.%d]" % (
+    return space.wrap("%d.%d.%d (%d, %s, %s)\n[PyPy %d.%d.%d]" % (
         CPYTHON_VERSION[0],
         CPYTHON_VERSION[1],
         CPYTHON_VERSION[2],

Modified: pypy/trunk/pypy/translator/goal/app_main.py
==============================================================================
--- pypy/trunk/pypy/translator/goal/app_main.py	(original)
+++ pypy/trunk/pypy/translator/goal/app_main.py	Tue Jan 13 15:59:23 2009
@@ -236,7 +236,7 @@
         elif arg == '-O':
             pass
         elif arg == '--version' or arg == '-V':
-            print sys.version
+            print "Python", sys.version
             return 0
         elif arg == '--info':
             print_info()