[pypy-svn] r16689 - in pypy/release/0.7.x/pypy: interpreter module/sys
pedronis at codespeak.net
pedronis at codespeak.net
Fri Aug 26 20:54:22 CEST 2005
Author: pedronis
Date: Fri Aug 26 20:54:21 2005
New Revision: 16689
Modified:
pypy/release/0.7.x/pypy/interpreter/interactive.py
pypy/release/0.7.x/pypy/module/sys/__init__.py
Log:
introduce a pypy_version_info attribute on our sys module, use it in interactive to produce the banner
Modified: pypy/release/0.7.x/pypy/interpreter/interactive.py
==============================================================================
--- pypy/release/0.7.x/pypy/interpreter/interactive.py (original)
+++ pypy/release/0.7.x/pypy/interpreter/interactive.py Fri Aug 26 20:54:21 2005
@@ -127,10 +127,10 @@
# sys.version, self.__class__.__name__,
# self.space.__class__.__name__)
w_sys = self.space.sys
- version = self.space.str_w(self.space.getattr(w_sys, self.space.wrap('version')))
+ major, minor, micro, _, _ = self.space.unwrap(self.space.sys.get('pypy_version_info'))
elapsed = time.time() - self.space._starttime
- banner = "PyPy %s in %s on top of Python %s (startupttime: %.2f secs)" % (
- version.split()[2],self.space.__repr__(), sys.version.split()[0], elapsed)
+ banner = "PyPy %d.%d.%d in %s on top of Python %s (startupttime: %.2f secs)" % (
+ major, minor, micro ,self.space.__repr__(), sys.version.split()[0], elapsed)
code.InteractiveConsole.interact(self, banner)
def raw_input(self, prompt=""):
Modified: pypy/release/0.7.x/pypy/module/sys/__init__.py
==============================================================================
--- pypy/release/0.7.x/pypy/module/sys/__init__.py (original)
+++ pypy/release/0.7.x/pypy/module/sys/__init__.py Fri Aug 26 20:54:21 2005
@@ -50,7 +50,8 @@
'copyright' : 'space.wrap("MIT-License")',
'api_version' : 'space.wrap(1012)',
'version_info' : 'space.wrap((2,4,1, "alpha", 42))',
- 'version' : 'space.wrap("2.4.1 (pypy 0.7.0beta build)")',
+ 'version' : 'space.wrap("2.4.1 (pypy 0.7.0 build)")',
+ 'pypy_version_info' : 'space.wrap((0,7,0, "alpha", 0))',
'hexversion' : 'space.wrap(0x020401a0)',
'ps1' : 'space.wrap(">>>> ")',
'ps2' : 'space.wrap(".... ")',
More information about the Pypy-commit
mailing list