[robotframework] r4287 committed - report IronPython with --version

[robotframework]

Revision: 4287
Author: pekka.klarck
Date: Wed Nov 17 06:36:49 2010
Log: report IronPython with --version
http://code.google.com/p/robotframework/source/detail?r=4287
Modified:
 /trunk/package.py
 /trunk/src/robot/version.py

=======================================
--- /trunk/package.py   Thu Sep 30 01:09:01 2010
+++ /trunk/package.py   Wed Nov 17 06:36:49 2010
@@ -71,9 +71,9 @@
 RELEASES = [re.compile('^alpha\d*$'), re.compile('^beta\d*$'),
             re.compile('^rc\d*$'), 'final']
 VERSION_CONTENT = """# Automatically generated by 'package.py' script.
+
 import sys

-
 VERSION = '%(version_number)s'
 RELEASE = '%(release_tag)s'
 TIMESTAMP = '%(timestamp)s'
@@ -84,11 +84,17 @@
     return VERSION + sep + RELEASE

 def get_full_version(who=''):
-    interpreter   =  sys.platform.startswith('java') and 'Jython'  
or 'Python'
-    syversion = sys.version.split()[0]
-    vers = '%%s %%s (%%s %%s on %%s)' %% (who, get_version(), interpreter,
-                                         syversion, sys.platform)
-    return vers.strip()
+    sys_version = sys.version.split()[0]
+    version = '%%s %%s (%%s %%s on %%s)' \\
+        %% (who, get_version(), _get_interpreter(), sys_version,  
sys.platform)
+    return version.strip()
+
+def _get_interpreter():
+    if sys.platform.startswith('java'):
+        return 'Jython'
+    if sys.platform == 'cli':
+        return 'IronPython'
+    return 'Python'

 if __name__ == '__main__':
     print get_version(*sys.argv[1:])
=======================================
--- /trunk/src/robot/version.py Mon Oct  4 16:54:52 2010
+++ /trunk/src/robot/version.py Wed Nov 17 06:36:49 2010
@@ -1,10 +1,10 @@
 # Automatically generated by 'package.py' script.
+
 import sys

-
 VERSION = 'trunk'
-RELEASE = '20101005'
-TIMESTAMP = '20101005-011718'
+RELEASE = '20101117'
+TIMESTAMP = '20101117-163540'

 def get_version(sep=' '):
     if RELEASE == 'final':
@@ -12,11 +12,17 @@
     return VERSION + sep + RELEASE

 def get_full_version(who=''):
-    interpreter   =  sys.platform.startswith('java') and 'Jython'  
or 'Python'
-    syversion = sys.version.split()[0]
-    vers = '%s %s (%s %s on %s)' % (who, get_version(), interpreter,
-                                         syversion, sys.platform)
-    return vers.strip()
+    sys_version = sys.version.split()[0]
+    version = '%s %s (%s %s on %s)' \
+        % (who, get_version(), _get_interpreter(), sys_version,  
sys.platform)
+    return version.strip()
+
+def _get_interpreter():
+    if sys.platform.startswith('java'):
+        return 'Jython'
+    if sys.platform == 'cli':
+        return 'IronPython'
+    return 'Python'

 if __name__ == '__main__':
     print get_version(*sys.argv[1:])