2 new revisions:
Revision: 2812b412ab4a
Author: Jussi Malinen
Date: Fri Jun 10 04:08:17 2011
Log: passing a file object to sax.parse, so that it would work in
jython
http://code.google.com/p/robotframework/source/detail?r=2812b412ab4a
Revision: cf308c36e54f
Author: Jussi Malinen
Date: Fri Jun 10 04:08:36 2011
Log: paths now start from robot.__file__
http://code.google.com/p/robotframework/source/detail?r=cf308c36e54f
==============================================================================
Revision: 2812b412ab4a
Author: Jussi Malinen
Date: Fri Jun 10 04:08:17 2011
Log: passing a file object to sax.parse, so that it would work in
jython
http://code.google.com/p/robotframework/source/detail?r=2812b412ab4a
Modified:
/src/robot/serializing/jsparser.py
=======================================
--- /src/robot/serializing/jsparser.py Thu Jun 9 23:47:55 2011
+++ /src/robot/serializing/jsparser.py Fri Jun 10 04:08:17 2011
@@ -175,7 +175,8 @@
def create_datamodel_from(input_filename):
robot = _RobotOutputHandler(Context())
- sax.parse(input_filename, robot)
+ with open(input_filename, 'r') as input:
+ sax.parse(input, robot)
return robot.datamodel
==============================================================================
Revision: cf308c36e54f
Author: Jussi Malinen
Date: Fri Jun 10 04:08:36 2011
Log: paths now start from robot.__file__
http://code.google.com/p/robotframework/source/detail?r=cf308c36e54f
Modified:
/src/robot/serializing/serialize_log.py
=======================================
--- /src/robot/serializing/serialize_log.py Fri Jun 10 02:10:12 2011
+++ /src/robot/serializing/serialize_log.py Fri Jun 10 04:08:36 2011
@@ -2,11 +2,12 @@
import re
import os
-from robot import webcontent, utils
-
-PATH = os.path.dirname(webcontent.__file__)+os.path.sep
-LOG_TEMPLATE = PATH + 'log.html'
-REPORT_TEMPLATE = PATH + 'report.html'
+import robot
+from robot import utils
+
+PATH = os.path.join(os.path.dirname(robot.__file__),'webcontent')
+LOG_TEMPLATE = os.path.join(PATH,'log.html')
+REPORT_TEMPLATE = os.path.join(PATH, 'report.html')
JS_FILE_REGEXP = re.compile('src=\"([^\"]+)\"')
def serialize_log(test_output_datamodel, log_path, title=None):
@@ -124,7 +125,7 @@
self._parsing = self._in_script
def _parse_js_file_name(self, line):
- return PATH + JS_FILE_REGEXP.search(line).group(1).replace('/',
os.path.sep)
+ return os.path.join(PATH,
JS_FILE_REGEXP.search(line).group(1).replace('/', os.path.sep))
def _write_js(self, js_file):
with open(js_file, 'r') as js:
