Author: laukpe
Date: Tue Nov 25 11:44:00 2008
New Revision: 1115
Modified:
trunk/src/robot/__init__.py
trunk/src/robot/libraries/Collections.py
trunk/src/robot/utils/__init__.py
trunk/src/robot/utils/robotversion.py
Log:
cleanup
Modified: trunk/src/robot/__init__.py
==============================================================================
--- trunk/src/robot/__init__.py (original)
+++ trunk/src/robot/__init__.py Tue Nov 25 11:44:00 2008
@@ -133,7 +133,7 @@
def _process_arguments(cliargs, usage, who):
- ap = utils.ArgumentParser(usage % {'VERSION': utils.get_version()},
+ ap = utils.ArgumentParser(usage % {'VERSION': utils.version},
utils.get_full_version(who))
try:
return ap.parse_args(cliargs, argfile='argumentfile',
unescape='escape',
Modified: trunk/src/robot/libraries/Collections.py
==============================================================================
--- trunk/src/robot/libraries/Collections.py (original)
+++ trunk/src/robot/libraries/Collections.py Tue Nov 25 11:44:00 2008
@@ -598,9 +598,9 @@
-------
- List related keywords use variables in format ${Lx} in their examples.
- this means a list with as many alphabetic characters as specified
by 'x'.
- For example ${L1}' means ['a'] and ${L3} means ['a', 'b', 'c'].
+ List related keywords use variables in format ${Lx} in their examples,
+ which means a list with as many alphabetic characters as specified
by 'x'.
+ For example ${L1} means ['a'] and ${L3} means ['a', 'b', 'c'].
Dictionary keywords use similar ${Dx} variable. For example ${D1} means
{'a': 1} and ${D3} means {'a': 1, 'b': 2, 'c': 3}.
Modified: trunk/src/robot/utils/__init__.py
==============================================================================
--- trunk/src/robot/utils/__init__.py (original)
+++ trunk/src/robot/utils/__init__.py Tue Nov 25 11:44:00 2008
@@ -45,10 +45,11 @@
from idgenerator import IdGenerator, FileNameGenerator
+# TODO: Capitalize these attributes. Do we need both VERSION and
get_version()?
version = get_version() # Robot version as string
py_version = sys.version_info[:2] # Python version in tuple (major,minor)
java_version = get_java_version() # Java version in tuple (major,minor)
-is_jython = os.name == 'java'
+is_jython = sys.platform.startswith('java')
is_windows = os.sep == '\\' # This works also in Jython on Windows
is_cygwin = 'cygwin' in sys.platform
platform = '%sython %s on %s' % (is_jython and 'J' or 'P',
Modified: trunk/src/robot/utils/robotversion.py
==============================================================================
--- trunk/src/robot/utils/robotversion.py (original)
+++ trunk/src/robot/utils/robotversion.py Tue Nov 25 11:44:00 2008
@@ -13,21 +13,14 @@
# limitations under the License.
-import os
import sys
import re
-from robot.version import VERSION, RELEASE
-
-
-def get_version():
- if RELEASE != 'final':
- return '%s %s' % (VERSION, RELEASE)
- return VERSION
+from robot.version import get_version
def get_java_version():
- if os.name != 'java':
+ if not sys.platform.startswith('java'):
return (0, 0)
try:
res = re.match("java(\d+)\.(\d+)", sys.platform)
