3 new revisions:
Revision: a6854b167f11
Author: Pekka Klärck
Date: Sun Jan 29 13:32:00 2012
Log: Removed not-so-useful code printing error when executing `-m
robot` wi...
http://code.google.com/p/robotframework/source/detail?r=a6854b167f11
Revision: 2e3b0f228efe
Author: Pekka Klärck
Date: Sun Jan 29 13:32:23 2012
Log: import pythonpathsetter cleanup
http://code.google.com/p/robotframework/source/detail?r=2e3b0f228efe
Revision: f8d9d1cacf69
Author: Pekka Klärck
Date: Sun Jan 29 13:42:51 2012
Log: fixed test after rebot --help changes
http://code.google.com/p/robotframework/source/detail?r=f8d9d1cacf69
==============================================================================
Revision: a6854b167f11
Author: Pekka Klärck
Date: Sun Jan 29 13:32:00 2012
Log: Removed not-so-useful code printing error when executing `-m
robot` with ?ython 2.5. With newer versions that is not allowed at all
because we have no __main__.py.
http://code.google.com/p/robotframework/source/detail?r=a6854b167f11
Modified:
/src/robot/__init__.py
=======================================
--- /src/robot/__init__.py Sun Jan 29 10:35:23 2012
+++ /src/robot/__init__.py Sun Jan 29 13:32:00 2012
@@ -14,10 +14,6 @@
import sys
-if __name__ == '__main__':
- sys.stderr.write("Use 'runner' or 'rebot' for executing.\n")
- sys.exit(252) # 252 == DATA_ERROR
-
if 'pythonpathsetter' not in sys.modules:
import pythonpathsetter
if sys.platform.startswith('java'):
==============================================================================
Revision: 2e3b0f228efe
Author: Pekka Klärck
Date: Sun Jan 29 13:32:23 2012
Log: import pythonpathsetter cleanup
http://code.google.com/p/robotframework/source/detail?r=2e3b0f228efe
Modified:
/src/robot/__init__.py
/src/robot/rebot.py
/src/robot/run.py
=======================================
--- /src/robot/__init__.py Sun Jan 29 13:32:00 2012
+++ /src/robot/__init__.py Sun Jan 29 13:32:23 2012
@@ -15,7 +15,7 @@
import sys
if 'pythonpathsetter' not in sys.modules:
- import pythonpathsetter
+ from robot import pythonpathsetter
if sys.platform.startswith('java'):
from robot import jythonworkarounds
from robot.conf import RobotSettings, RebotSettings
=======================================
--- /src/robot/rebot.py Sun Jan 29 12:53:42 2012
+++ /src/robot/rebot.py Sun Jan 29 13:32:23 2012
@@ -250,12 +250,8 @@
import sys
-try:
- import pythonpathsetter
-except ImportError:
- # Get here when run as 'python -m robot.rebot' and then importing robot
- # works without this and pythonpathsetter is imported again later.
- pass
+if 'robot' not in sys.modules:
+ import pythonpathsetter # running robot/rebot.py as a script
import robot
=======================================
--- /src/robot/run.py Sun Jan 29 13:15:49 2012
+++ /src/robot/run.py Sun Jan 29 13:32:23 2012
@@ -308,12 +308,8 @@
import sys
-try:
- import pythonpathsetter
-except ImportError:
- # Get here when run as 'python -m robot.runner' and then importing
robot
- # works without this and pythonpathsetter is imported again later.
- pass
+if 'robot' not in sys.modules:
+ import pythonpathsetter # running robot/run.py as a script
import robot
==============================================================================
Revision: f8d9d1cacf69
Author: Pekka Klärck
Date: Sun Jan 29 13:42:51 2012
Log: fixed test after rebot --help changes
http://code.google.com/p/robotframework/source/detail?r=f8d9d1cacf69
Modified:
/atest/robot/cli/rebot/help_and_version.txt
=======================================
--- /atest/robot/cli/rebot/help_and_version.txt Thu Jan 12 04:38:48 2012
+++ /atest/robot/cli/rebot/help_and_version.txt Sun Jan 29 13:42:51 2012
@@ -11,7 +11,8 @@
Should Be Equal ${rc} ${251}
Log ${help.replace(' ','_').replace('\\t','_'*8)}
Should Start With ${help} Rebot -- Robot Framework Report and Log
Generator\n \n Version: \
- Should End With ${help} \n\n# Running 'robot/rebot.py' directly and
creating combined outputs.\n $ python /path/robot/rebot.py -N Project_X -l
x.html -r x.html outputs/*.xml\n
+ Should End With ${help} \n$ jython path/robot/rebot.py -N Project_X
-l none -r x.html output.xml\n
+
Should Not Contain ${help} ERROR
@{lines} = Evaluate [ '%d\\t%s' % (len(line), line) for line in
${help.splitlines()} ]
Log Many @{lines}
