Revision: 3377
Author: jussi.ao.malinen
Date: Fri May 21 04:01:55 2010
Log: import libraries work! (almost, kinda)
http://code.google.com/p/robotframework/source/detail?r=3377
Modified:
/trunk/src/robot/running/importer.py
/trunk/src/robot/running/namespace.py
=======================================
--- /trunk/src/robot/running/importer.py Thu May 20 23:51:07 2010
+++ /trunk/src/robot/running/importer.py Fri May 21 04:01:55 2010
@@ -31,7 +31,7 @@
lib = TestLibrary(name, args, variables)
positional, named = lib.positional_args, lib.named_args
lib = self._import_library(name, positional, named, lib)
- if name != alias:
+ if alias and name != alias:
lib = self._copy_library(lib, alias)
LOGGER.info("Imported library '%s' with name '%s'" % (name,
alias))
return lib
=======================================
--- /trunk/src/robot/running/namespace.py Thu May 20 23:45:04 2010
+++ /trunk/src/robot/running/namespace.py Fri May 21 04:01:55 2010
@@ -111,7 +111,7 @@
name = self._get_library_name(import_setting, variables)
lib = IMPORTER.import_library(name, import_setting.args,
import_setting.alias, variables)
- if self._testlibs.has_key(lib.name):
+ if lib.name in self._testlibs:
LOGGER.info("Test library '%s' already imported by suite '%s'"
% (lib.name, self.suite.longname))
return
