[robotframework] r3615 committed - Fixed after API changes

[robotframework]

Revision: 3615
Author: janne.t.harkonen
Date: Fri May 28 00:59:22 2010
Log: Fixed after API changes
http://code.google.com/p/robotframework/source/detail?r=3615

Modified:
 /trunk/tools/testdoc/testdoc.py

=======================================
--- /trunk/tools/testdoc/testdoc.py     Fri May  7 09:59:20 2010
+++ /trunk/tools/testdoc/testdoc.py     Fri May 28 00:59:22 2010
@@ -58,10 +58,10 @@
 from robot.serializing import templates
 from robot.serializing.templating import Namespace, Template
 from robot.errors import DataError, Information
-from robot.parsing import rawdata
+from robot.parsing import datareader
 from robot.variables import Variables

-rawdata.PROCESS_CURDIR = False
+datareader.PROCESS_CURDIR = False
 Variables.set_from_variable_table = lambda self, varz: None


@@ -132,8 +132,8 @@
         LogSerializer.start_test(self, test)

     def start_keyword(self, kw):
-        if isinstance(kw, Keyword):  # Doesn't match For or Parallel
-            kw.name = kw._get_name(kw.name, NonResolvingContext())
+        if isinstance(kw, Keyword):  # Doesn't match For
+            kw.name = kw._get_name(kw.name)
         LogSerializer.start_keyword(self, kw)

     def _is_element_open(self, item):
@@ -176,6 +176,12 @@
     def replace_vars_from_setting(self, name, item, errors):
         return item

+    def replace_string(self, item):
+        return item
+
+    def get_current_vars(self):
+        return NonResolvingContext()
+

 if __name__ == '__main__':
     generate_test_doc(sys.argv[1:])