Revision: 3580
Author: janne.t.harkonen
Date: Thu May 27 05:25:49 2010
Log: minor cleanup, added TODO
http://code.google.com/p/robotframework/source/detail?r=3580
Modified:
/trunk/src/robot/running/namespace.py
=======================================
--- /trunk/src/robot/running/namespace.py Wed May 26 07:41:53 2010
+++ /trunk/src/robot/running/namespace.py Thu May 27 05:25:49 2010
@@ -414,18 +414,17 @@
def set_from_variable_table(self, rawvariables):
self._suite.set_from_variable_table(rawvariables)
- # FIXME: Do we still need this?
+ # TODO: This should be removed so that these objects themselves had
+ # the capability of resolving variables.
def replace_meta(self, name, item, errors):
error = None
for varz in [self.current] + self._parents:
try:
- if name in ['Setup', 'Teardown']:
- return varz.replace_list(item[:1]) + item[1:]
if name == 'Documentation':
return varz.replace_string(item, ignore_errors=True)
- if utils.is_list(item):
- return varz.replace_list(item)
- return varz.replace_string(item)
+ elif isinstance(item, basestring):
+ return varz.replace_string(item)
+ return varz.replace_list(item)
except DataError, error:
pass
errors.append("Replacing variables from setting '%s' failed: %s"
