Author: janne.t.harkonen
Date: Tue Mar 24 06:22:56 2009
New Revision: 1501
Modified:
trunk/src/robot/parsing/metadata.py
trunk/src/robot/running/namespace.py
trunk/src/robot/running/testlibraries.py
Log:
Merge branch 'syslog'
Modified: trunk/src/robot/parsing/metadata.py
==============================================================================
--- trunk/src/robot/parsing/metadata.py (original)
+++ trunk/src/robot/parsing/metadata.py Tue Mar 24 06:22:56 2009
@@ -15,7 +15,6 @@
import os
import sys
-import urlparse
from robot import utils
from robot.errors import DataError
Modified: trunk/src/robot/running/namespace.py
==============================================================================
--- trunk/src/robot/running/namespace.py (original)
+++ trunk/src/robot/running/namespace.py Tue Mar 24 06:22:56 2009
@@ -58,7 +58,7 @@
def copy(self):
# Namespace is copied by ParallelKeyword
- ns = Namespace(None, None, None)
+ ns = Namespace(None, None)
ns.variables = self.variables.copy_all()
ns.suite = self.suite
ns.test = self.test
Modified: trunk/src/robot/running/testlibraries.py
==============================================================================
--- trunk/src/robot/running/testlibraries.py (original)
+++ trunk/src/robot/running/testlibraries.py Tue Mar 24 06:22:56 2009
@@ -78,7 +78,7 @@
self._init_scope_handling()
def copy(self, name):
- lib = _BaseTestLibrary(None, self.version, name, self.args, None)
+ lib = _BaseTestLibrary(None, self.version, name, self.args)
lib.orig_name = self.name
lib.doc = self.doc
lib.scope = self.scope
