merged with [dev] branch

Author: userzimmermann

.travis.yml

@@ -11,6 +11,7 @@ install:
   - pip install -r requirements.txt --upgrade
   - pip install -r requirements.remote.txt --upgrade
   - pip install -r requirements.robotshell.txt --upgrade
+  - pip install robotframework-python3
   - pip install zetup[commands] --upgrade
   - pip install pytest --upgrade
   - pip install tox --upgrade

README.md

@@ -40,11 +40,13 @@ Package extra features:
 
 ### Requirements
 
-* [`six>=1.9`](https://pypi.python.org/pypi/six)
-* [`path.py>=7.0`](https://pypi.python.org/pypi/path.py)
-* [`moretools>=0.1.5`](https://pypi.python.org/pypi/moretools)
-* [`robotframework>=2.8`](https://pypi.python.org/pypi/robotframework)
-  * __Python 3.x__: [`robotframework-python3>=2.8.3`](
+* [`six>=1.10`](https://pypi.python.org/pypi/six)
+* [`path.py>=8.0`](https://pypi.python.org/pypi/path.py)
+* [`moretools>=0.1.8`](https://pypi.python.org/pypi/moretools)
+* [`robotframework>=2.8.7`](https://pypi.python.org/pypi/robotframework)
+* __Python 3.x__: 
+  * Robot Framework 3.0+ is officially Python 3 compatible
+  * For earlier versions please install [`robotframework-python3`](
       https://pypi.python.org/pypi/robotframework-python3)
 
 Extra requirements for __[remote]__:
@@ -53,7 +55,7 @@ Extra requirements for __[remote]__:
 
 Extra requirements for __[robotshell]__:
 
-* [`ipython>=3.0`](https://pypi.python.org/pypi/ipython)
+* [`ipython>=4.0`](https://pypi.python.org/pypi/ipython)
 
 ### Installation
 
@@ -71,6 +73,8 @@ Or from [PyPI](https://pypi.python.org/pypi/robotframework-tools):
 
         pip install robotframework-tools[remote,robotshell]
 
+* Robot Framework will not be installed automatically
+
 
 # 1. Creating Dynamic Test Libraries
 ------------------------------------

requirements.txt

@@ -3,5 +3,3 @@ six >= 1.10
 path.py >= 8.0 #import path
 moretools >= 0.1.8
 modeled >= 0.1.8
-#py2 robotframework >= 2.8.7 #import robot
-#py3 robotframework-python3 >= 2.8.7 #import robot

robottools/__init__.py

@@ -25,6 +25,7 @@
 """
 
 from zetup import find_zetup_config
+from zetup.version import Version
 
 zfg = find_zetup_config(__name__)
 
@@ -38,6 +39,17 @@
 
 ## __notebook__ = zfg.NOTEBOOKS['README']
 
+try:
+    import robot
+except ImportError as exc:
+    raise ImportError(
+        "%s depends on robotframework but import failed with: %s"
+        % (repr(__distribution__), exc))
+if Version(robot.__version__) < '2.8.7':
+    raise __import__('pkg_resources').VersionConflict(
+        "%s needs robotframework>=2.8.7 but found %s in %s"
+        % (repr(__distribution__), robot.__version__, repr(robot)))
+
 from robottools.library import *
 from robottools.library.keywords import *
 from robottools.library.session import SessionHandler

robottools/library/keywords/__init__.py

@@ -147,18 +147,17 @@ def __call__(self, *args, **kwargs):
             try:
                 sname = kwargs.pop(identifier)
             except KeyError:
-                pass
-            else:
-                previous = getattr(self.libinstance, identifier)
-                switch = getattr(self.libinstance, 'switch_' + identifier)
-                try:
-                    switch(sname)
-                except hcls.SessionError:
-                    error = sys.exc_info()
-                    # don't switch any more sessions
-                    break
-                # store previous session for switching back later
-                current_sessions[identifier, plural_identifier] = previous
+                continue
+            previous = getattr(self.libinstance, identifier)
+            switch = getattr(self.libinstance, 'switch_' + identifier)
+            try:
+                switch(sname)
+            except hcls.SessionError:
+                error = sys.exc_info()
+                # don't switch any more sessions
+                break
+            # store previous session for switching back later
+            current_sessions[identifier, plural_identifier] = previous
         # only perform explicit context switching
         # if explicit session switching didn't raise any error
         current_contexts = {}
@@ -170,19 +169,17 @@ def __call__(self, *args, **kwargs):
                 try:
                     ctxname = kwargs.pop(identifier)
                 except KeyError:
-                    pass
-                else:
-                    previous = getattr(self.libinstance, identifier)
-                    switch = getattr(self.libinstance,
-                                     'switch_' + identifier)
-                    try:
-                        switch(ctxname)
-                    except hcls.ContextError:
-                        error = sys.exc_info()
-                        # don't switch any more contexts
-                        break
-                    # store previous context for switching back later
-                    current_contexts[identifier] = previous
+                    continue
+                previous = getattr(self.libinstance, identifier)
+                switch = getattr(self.libinstance, 'switch_' + identifier)
+                try:
+                    switch(ctxname)
+                except hcls.ContextError:
+                    error = sys.exc_info()
+                    # don't switch any more contexts
+                    break
+                # store previous context for switching back later
+                current_contexts[identifier] = previous
         # only call the acutal keyword func
         # if explicit session and context switching didn't raise any error
         if error is None:

robottools/testrobot/__init__.py

@@ -23,27 +23,27 @@
 
 .. moduleauthor:: Stefan Zimmermann <[email protected]>
 """
-from six import reraise
-
-__all__ = ['TestRobot',
-  'TestResult', # from .result
-  ]
+__all__ = [
+    'TestRobot',
+    'TestResult', # from .result
+]
 
+from six import reraise
 from inspect import getargspec
 from functools import partial
 
 from moretools import isidentifier
 
 from robot.errors import DataError
-from robot.model import TestSuite
 from robot.conf import RobotSettings
+from robot.running.model import TestSuite
+from robot.running.namespace import Namespace
+from robot.running.runner import Runner
+from robot.running import TestSuiteBuilder
 try:
     from robot.variables import GLOBAL_VARIABLES, init_global_variables
 except ImportError: # Robot 2.9
     from robot.variables import VariableScopes
-from robot.running.namespace import Namespace
-from robot.running.runner import Runner
-from robot.running import TestSuiteBuilder
 
 from robottools import TestLibraryInspector
 
@@ -76,25 +76,36 @@ def __init__(self, name, BuiltIn=True, variable_getters=None):
         self.debug = False
         try:
             GLOBAL_VARIABLES
-        except NameError: # Robot 2.9
+        except NameError:
+            # Robot 2.9+
             self._variables = VariableScopes(RobotSettings())
         else:
-            if not GLOBAL_VARIABLES: #HACK
+            # Robot 2.8
+            if not GLOBAL_VARIABLES: # HACK
                 init_global_variables(RobotSettings())
             self._variables = GLOBAL_VARIABLES.copy()
-        #HACK even more to extend variable lookup:
+        # HACK even more to extend variable lookup
         self._variables.__class__ = variablesclass(
-          self._variables.__class__, extra_getters=variable_getters)
+            self._variables.__class__, extra_getters=variable_getters)
+
         self._output = Output()
         self._context = Context(testrobot=self)
         self._suite = TestSuite(name)
-        namespace = partial(Namespace,
-          suite=self._suite, variables=self._variables,
-          user_keywords=[], imports=None)
-        if 'parent_variables' in getargspec(Namespace.__init__).args:
-            self._namespace = namespace(parent_variables=None)
-        else: # Robot 2.9
-            self._namespace = namespace()
+
+        argspec = getargspec(Namespace.__init__)
+        namespace = partial(
+            Namespace, suite=self._suite, variables=self._variables)
+        if 'resource' in argspec.args:
+            # Robot 3.0
+            self._namespace = namespace(resource=self._suite.resource)
+        else:
+            namespace.keywords.update(user_keywords=[], imports=None)
+            if 'parent_variables' in argspec.args:
+                # Robot 2.8
+                self._namespace = namespace(parent_variables=None)
+            else:
+                # Robot 2.9
+                self._namespace = namespace()
 
         if BuiltIn:
             self.Import('BuiltIn')
@@ -115,8 +126,8 @@ def __doc__(self):
         """Dynamic doc string, listing imported Test Libraries.
         """
         return '%s\n\n%s' % (repr(self), '\n\n'.join(sorted(
-          '* [Import] ' + lib.name
-          for alias, lib in self._libraries.items())))
+            '* [Import] ' + lib.name
+            for alias, lib in self._libraries.items())))
 
     def Import(self, lib, args=None, alias=None):
         """Import a Test Library with an optional `alias` name.
@@ -125,8 +136,8 @@ def Import(self, lib, args=None, alias=None):
             #HACK: `with` adds Context to robot.running.EXECUTION_CONTEXTS
             # and registers Output to robot.output.LOGGER
             with self._context:
-                lib = self._context.importer.import_library(lib,
-                  args and list(args), alias, None)
+                lib = self._context.importer.import_library(
+                    lib, args and list(args), alias, None)
                 self._libraries[alias or lib.name] = lib
                 lib = TestLibraryInspector(lib)
                 ## lib = TestLibraryInspector(lib, *(args or ()))
@@ -189,8 +200,8 @@ def __getattr__(self, name):
                 return self._variables['${%s}' % name]
             except DataError:
                 raise AttributeError(
-                  "No Test Library, Keyword or Variable named '%s'."
-                  % name)
+                    "No Test Library, Keyword or Variable named '%s'."
+                    % name)
 
     def __dir__(self):
         """List all Robot Variables (UPPER_CASE),

robottools/testrobot/context.py

@@ -38,6 +38,7 @@ def __init__(self, testrobot):
         self.in_teardown = False
         self.test = None
         self.importer = Importer()
+        self.timeouts = set()
 
     def __enter__(self):
         """Prepare the TestRobot's context
@@ -84,6 +85,10 @@ def get_handler(self, name):
                 repr(self.testrobot.name), repr(name)))
         return keyword._handler
 
+    def get_runner(self, name):
+        handler = self.get_handler(name)
+        return handler.create_runner(name)
+
     def start_keyword(self, keyword):
         pass
 

robottools/testrobot/output.py

@@ -30,6 +30,10 @@
 from robot.output import LOGGER, LEVELS as LOG_LEVELS
 from robot.output.loggerhelper import AbstractLogger
 from robot.output.pyloggingconf import RobotHandler
+try: # Robot 3.0
+    from robot.output.listeners import LibraryListeners
+except ImportError:
+    LibraryListeners = None
 
 from .highlighting import Highlighter
 
@@ -61,11 +65,17 @@ class Output(AbstractLogger):
     def __init__(self, log_level='INFO'):
         AbstractLogger.__init__(self, level=log_level)
         self.logging_handler = LoggingHandler()
+        if LibraryListeners is not None:
+            # Robot 3.0
+            self.library_listeners = LibraryListeners(log_level)
         # streams to be used internally for writing messages
         # - see self.__enter__() and self.message()
         self._out = self._err = None
 
     def set_log_level(self, level):
+        if LibraryListeners is not None:
+            # Robot 3.0
+            self.library_listeners.set_log_level(level)
         return self.set_level(level)
 
     def __enter__(self):

tox.ini

@@ -7,7 +7,8 @@ envlist = py27,py33,py34
 
 [testenv]
 deps =
+    robotframework-python3
     pytest
 
 commands =
-    py.test -v test
+    py.test -v test

zetup.cfg

@@ -21,6 +21,7 @@ zetup_config module = yes
 
 no make =
     VERSION
+    tox.ini
 
 keep made =
     setup.py