diff --git a/src/robotkernel/builders_32.py b/src/robotkernel/builders_32.py index f3019bd..d461465 100644 --- a/src/robotkernel/builders_32.py +++ b/src/robotkernel/builders_32.py @@ -2,17 +2,32 @@ from io import StringIO from robot.api import get_model from robot.errors import DataError -from robot.running.builder.parsers import ErrorReporter from robot.running.builder.transformers import SettingsBuilder from robot.running.builder.transformers import SuiteBuilder from robot.running.model import TestSuite from typing import Dict import os + +try: + from robot.running.builder.transformers import ErrorReporter +except ImportError: + from robot.running.builder.parsers import ErrorReporter + try: from robot.running.builder.testsettings import TestDefaults except ImportError: - from robot.running.builder.settings import Defaults as TestDefaults + try: + from robot.running.builder.settings import TestDefaults + except ImportError: + from robot.running.builder.settings import Defaults as TestDefaults + +try: + from robot.running.builder.settings import FileSettings + + HAS_RF61 = True +except ImportError: + HAS_RF61 = False def _get_rpa_mode(data): @@ -31,7 +46,10 @@ def _get_rpa_mode(data): def build_suite(code: str, cell_history: Dict[str, str], data_only: bool = False): # Init suite = TestSuite(name="Jupyter", source=os.getcwd()) - defaults = TestDefaults(None) + if HAS_RF61: + defaults = FileSettings(TestDefaults(None)) + else: + defaults = TestDefaults(None) # Populate history for historical in cell_history.values(): diff --git a/src/robotkernel/kernel.py b/src/robotkernel/kernel.py index f8ffd71..0788643 100644 --- a/src/robotkernel/kernel.py +++ b/src/robotkernel/kernel.py @@ -171,7 +171,7 @@ def do_complete(self, code, cursor_pos): "status": "ok", } - def do_inspect(self, code, cursor_pos, detail_level=0): + def do_inspect(self, code, cursor_pos, detail_level=0, _=None): cursor_pos = cursor_pos is None and len(code) or cursor_pos line, offset = line_at_cursor(code, cursor_pos) line_cursor = cursor_pos - offset diff --git a/src/robotkernel/selectors_white.py b/src/robotkernel/selectors_white.py index fcce07b..0a587cf 100644 --- a/src/robotkernel/selectors_white.py +++ b/src/robotkernel/selectors_white.py @@ -26,7 +26,6 @@ class PickSnipTool(Form): - mouse_down = None mouse_down_button = None mouse_down_seconds = 0