robotframework 7.0rc2__zip → 7.0.1__zip

{robotframework-7.0rc2 → robotframework-7.0.1}/INSTALL.rst

@@ -28,13 +28,13 @@ is having Python or its alternative implementation `PyPy <https://pypy.org>`_
 installed. Another recommended precondition is having the pip_ package manager
 available.
 
-Robot Framework requires Python 3.6 or newer. If you need to use Python 2,
+Robot Framework requires Python 3.8 or newer. The latest version that supports
+Python 3.6 and 3.7 is `Robot Framework 6.1.1`__. If you need to use Python 2,
 `Jython <http://jython.org>`_ or `IronPython <http://ironpython.net>`_,
 you can use `Robot Framework 4.1.3`__.
-The forthcoming Robot Framework 7.0 will require `Python 3.8 or newer`__.
 
+__ https://github.com/robotframework/robotframework/blob/v6.1.1/INSTALL.rst
 __ https://github.com/robotframework/robotframework/blob/v4.1.3/INSTALL.rst
-__ https://github.com/robotframework/robotframework/issues/4294
 
 Installing Python on Linux
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -47,10 +47,10 @@ Python version than the one provided by your distribution by default.
 To check what Python version you have installed, you can run `python --version`
 command in a terminal:
 
-.. sourcecode:: bash
+.. code:: bash
 
   $ python --version
-  Python 3.8.10
+  Python 3.10.13
 
 Notice that if your distribution provides also older Python 2, running `python`
 may use that. To use Python 3, you can use `python3` command or even more version
@@ -58,12 +58,12 @@ specific command like `python3.8`. You need to use these version specific varian
 also if you have multiple Python 3 versions installed and need to pinpoint which
 one to use:
 
-.. sourcecode:: bash
+.. code:: bash
 
-  $ python3.9 --version
-  Python 3.9.10
-  $ python3.10 --version
-  Python 3.10.2
+  $ python3.11 --version
+  Python 3.11.7
+  $ python3.12 --version
+  Python 3.12.1
 
 Installing Robot Framework directly under the system provided Python
 has a risk that possible problems can affect the whole Python installation
@@ -89,21 +89,21 @@ to select the `Add Python 3.x to PATH` checkbox on the first dialog.
 To make sure Python installation has been successful and Python has been
 added to `PATH`, you can open the command prompt and execute `python --version`:
 
-.. sourcecode:: batch
+.. code:: batch
 
   C:\>python --version
-  Python 3.9.4
+  Python 3.10.9
 
 If you install multiple Python versions on Windows, the version that is used
 when you execute `python` is the one first in `PATH`. If you need to use others,
 the easiest way is using the `py launcher`__:
 
-.. sourcecode:: batch
+.. code:: batch
 
   C:\>py --version
-  Python 3.9.4
-  C:\>py -3.10 --version
-  Python 3.10.2
+  Python 3.10.9
+  C:\>py -3.12 --version
+  Python 3.12.1
 
 __ https://docs.python.org/3/using/windows.html
 __ https://docs.python.org/3/using/windows.html#windows-full
@@ -200,21 +200,21 @@ To make sure you have pip available, you can run `pip --version` or equivalent.
 
 Examples on Linux:
 
-.. sourcecode:: bash
+.. code:: bash
 
   $ pip --version
-  pip 20.2 from ... (python 3.8)
-  $ python3.10 -m pip --version
-  pip 20.2 from ... (python 3.10)
+  pip 23.2.1 from ... (python 3.10)
+  $ python3.12 -m pip --version
+  pip 23.3.1 from ... (python 3.12)
 
 Examples on Windows:
 
-.. sourcecode:: batch
+.. code:: batch
 
   C:\> pip --version
-  pip 20.2.2 from ... (python 3.9)
-  C:\> py -m 3.10 -m pip --version
-  pip 20.2.1 from ... (python 3.10)
+  pip 23.2.1 from ... (python 3.10)
+  C:\> py -m 3.12 -m pip --version
+  pip 23.3.2 from ... (python 3.12)
 
 In the subsequent sections pip is always run using the `pip` command. You may
 need to use some of the other approaches explained above in your environment.
@@ -229,7 +229,7 @@ shown below and pip_ documentation has more information and examples.
 
 __ PyPI_
 
-.. sourcecode:: bash
+.. code:: bash
 
     # Install the latest version (does not upgrade)
     pip install robotframework
@@ -241,10 +241,10 @@ __ PyPI_
     pip install --upgrade --pre robotframework
 
     # Install a specific version
-    pip install robotframework==5.0
+    pip install robotframework==7.0
 
     # Install separately downloaded package (no network connection needed)
-    pip install robotframework-5.0-py3-none-any.whl
+    pip install robotframework-7.0-py3-none-any.whl
 
     # Install latest (possibly unreleased) code directly from GitHub
     pip install https://github.com/robotframework/robotframework/archive/master.zip
@@ -265,7 +265,7 @@ repository and checking out the needed release tag.
 
 Once you have the source code, you can install it with the following command:
 
-.. sourcecode:: bash
+.. code:: bash
 
    python setup.py install
 
@@ -280,10 +280,10 @@ Verifying installation
 To make sure that the correct Robot Framework version has been installed, run
 the following command:
 
-.. sourcecode:: bash
+.. code:: bash
 
    $ robot --version
-   Robot Framework 5.0 (Python 3.8.10 on linux)
+   Robot Framework 7.0 (Python 3.10.3 on linux)
 
 If running these commands fails with a message saying that the command is
 not found or recognized, a good first step is double-checking the PATH_
@@ -294,13 +294,13 @@ running `robot` will execute the one first in PATH_. To select explicitly,
 you can run `python -m robot` and substitute `python` with the right Python
 version.
 
-.. sourcecode:: bash
+.. code:: bash
 
-   $ python3.10 -m robot --version
-   Robot Framework 5.0 (Python 3.10.2 on linux)
+   $ python3.12 -m robot --version
+   Robot Framework 7.0 (Python 3.12.1 on linux)
 
-   C:\>py -3.10 -m robot --version
-   Robot Framework 5.0 (Python 3.10.3 on win32)
+   C:\>py -3.11 -m robot --version
+   Robot Framework 7.0 (Python 3.11.7 on win32)
 
 Virtual environments
 --------------------

{robotframework-7.0rc2/src/robotframework.egg-info → robotframework-7.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: robotframework
-Version: 7.0rc2
+Version: 7.0.1
 Summary: Generic automation framework for acceptance testing and robotic process automation (RPA)
 Home-page: https://robotframework.org
 Author: Pekka Klärck
@@ -10,7 +10,7 @@ Download-URL: https://pypi.org/project/robotframework
 Project-URL: Source, https://github.com/robotframework/robotframework
 Project-URL: Issue Tracker, https://github.com/robotframework/robotframework/issues
 Project-URL: Documentation, https://robotframework.org/robotframework
-Project-URL: Release Notes, https://github.com/robotframework/robotframework/blob/master/doc/releasenotes/rf-7.0rc2.rst
+Project-URL: Release Notes, https://github.com/robotframework/robotframework/blob/master/doc/releasenotes/rf-7.0.1.rst
 Project-URL: Slack, http://slack.robotframework.org
 Description: Robot Framework
         ===============
@@ -63,10 +63,12 @@ Description: Robot Framework
         For more detailed installation instructions, including installing Python, see
         `INSTALL.rst <https://github.com/robotframework/robotframework/blob/master/INSTALL.rst>`__.
         
-        Robot Framework requires Python 3.6 or newer and runs also on `PyPy <http://pypy.org>`_.
+        Robot Framework requires Python 3.8 or newer and runs also on `PyPy <http://pypy.org>`_.
+        The latest version that supports Python 3.6 and 3.7 is `Robot Framework 6.1.1`__.
         If you need to use Python 2, `Jython <http://jython.org>`_ or
         `IronPython <http://ironpython.net>`_, you can use `Robot Framework 4.1.3`__.
         
+        __ https://github.com/robotframework/robotframework/tree/v6.1.1#readme
         __ https://github.com/robotframework/robotframework/tree/v4.1.3#readme
         
         Example

{robotframework-7.0rc2 → robotframework-7.0.1}/README.rst

@@ -49,10 +49,12 @@ you can simply run::
 For more detailed installation instructions, including installing Python, see
 `<INSTALL.rst>`__.
 
-Robot Framework requires Python 3.6 or newer and runs also on `PyPy <http://pypy.org>`_.
+Robot Framework requires Python 3.8 or newer and runs also on `PyPy <http://pypy.org>`_.
+The latest version that supports Python 3.6 and 3.7 is `Robot Framework 6.1.1`__.
 If you need to use Python 2, `Jython <http://jython.org>`_ or
 `IronPython <http://ironpython.net>`_, you can use `Robot Framework 4.1.3`__.
 
+__ https://github.com/robotframework/robotframework/tree/v6.1.1#readme
 __ https://github.com/robotframework/robotframework/tree/v4.1.3#readme
 
 Example

{robotframework-7.0rc2 → robotframework-7.0.1}/setup.py

@@ -6,7 +6,7 @@ from setuptools import find_packages, setup
 
 # Version number typically updated by running `invoke set-version <version>`.
 # Run `invoke --help set-version` or see tasks.py for details.
-VERSION = '7.0rc2'
+VERSION = '7.0.1'
 with open(join(dirname(abspath(__file__)), 'README.rst')) as f:
     LONG_DESCRIPTION = f.read()
     base_url = 'https://github.com/robotframework/robotframework/blob/master'

{robotframework-7.0rc2 → robotframework-7.0.1}/src/robot/api/interfaces.py

@@ -422,7 +422,7 @@ class VariablesAttributes(TypedDict):
 
 
 class ListenerV2:
-    """Optional base class for listeners using the listener API v2."""
+    """Optional base class for listeners using the listener API version 2."""
     ROBOT_LISTENER_API_VERSION = 2
 
     def start_suite(self, name: str, attributes: StartSuiteAttributes):
@@ -501,7 +501,7 @@ class ListenerV2:
 
 
 class ListenerV3:
-    """Optional base class for listeners using the listener API v3."""
+    """Optional base class for listeners using the listener API version 3."""
     ROBOT_LISTENER_API_VERSION = 3
 
     def start_suite(self, data: running.TestSuite, result: result.TestSuite):
@@ -519,10 +519,12 @@ class ListenerV3:
     def start_keyword(self, data: running.Keyword, result: result.Keyword):
         """Called when a keyword starts by default.
 
-        The default implementation calls :meth:`start_body_item`.
+        This method is called, by default, with user keywords, library keywords
+        and when a keyword call is invalid. It is not called, however, if a more
+        specific :meth:`start_user_keyword`, :meth:`start_library_keyword` or
+        :meth:`start_invalid_keyword` method is implemented.
 
-        See also :meth:`start_user_keyword`, :meth:`start_library_keyword` and
-        :meth:`start_invalid_keyword`.
+        The default implementation calls :meth:`start_body_item`.
 
         New in Robot Framework 7.0.
         """
@@ -531,10 +533,12 @@ class ListenerV3:
     def end_keyword(self, data: running.Keyword, result: result.Keyword):
         """Called when a keyword ends by default.
 
-        The default implementation calls :meth:`end_body_item`.
+        This method is called, by default, with user keywords, library keywords
+        and when a keyword call is invalid. It is not called, however, if a more
+        specific :meth:`end_user_keyword`, :meth:`end_library_keyword` or
+        :meth:`end_invalid_keyword` method is implemented.
 
-        See also :meth:`end_user_keyword`, :meth:`end_library_keyword` and
-        :meth:`end_invalid_keyword`.
+        The default implementation calls :meth:`end_body_item`.
 
         New in Robot Framework 7.0.
         """
@@ -590,7 +594,7 @@ class ListenerV3:
         """Called when an invalid keyword call starts.
 
         Keyword may not have been found, there could have been multiple matches,
-        or the keyword itself could be broken.
+        or the keyword call itself could have been invalid.
 
         The default implementation calls :meth:`start_keyword`.
 
@@ -604,7 +608,7 @@ class ListenerV3:
         """Called when an invalid keyword call ends.
 
         Keyword may not have been found, there could have been multiple matches,
-        or the keyword itself could be broken.
+        or the keyword call itself could have been invalid.
 
         The default implementation calls :meth:`end_keyword`.
 

{robotframework-7.0rc2 → robotframework-7.0.1}/src/robot/conf/languages.py

@@ -1255,3 +1255,48 @@ class Vi(Language):
     but_prefixes = ['Nhưng']
     true_strings = ['Đúng', 'Vâng', 'Mở']
     false_strings = ['Sai', 'Không', 'Tắt', 'Không Có Gì']
+
+
+class Ja(Language):
+    """Japanese
+
+    New in Robot Framework 7.0.1.
+    """
+    settings_header = '設定'
+    variables_header = '変数'
+    test_cases_header = 'テスト ケース'
+    tasks_header = 'タスク'
+    keywords_header = 'キーワード'
+    comments_header = 'コメント'
+    library_setting = 'ライブラリ'
+    resource_setting = 'リソース'
+    variables_setting = '変数'
+    name_setting = '名前'
+    documentation_setting = 'ドキュメント'
+    metadata_setting = 'メタデータ'
+    suite_setup_setting = 'スイート セットアップ'
+    suite_teardown_setting = 'スイート ティアダウン'
+    test_setup_setting = 'テスト セットアップ'
+    task_setup_setting = 'タスク セットアップ'
+    test_teardown_setting = 'テスト ティアダウン'
+    task_teardown_setting = 'タスク ティアダウン'
+    test_template_setting = 'テスト テンプレート'
+    task_template_setting = 'タスク テンプレート'
+    test_timeout_setting = 'テスト タイムアウト'
+    task_timeout_setting = 'タスク タイムアウト'
+    test_tags_setting = 'テスト タグ'
+    task_tags_setting = 'タスク タグ'
+    keyword_tags_setting = 'キーワード タグ'
+    setup_setting = 'セットアップ'
+    teardown_setting = 'ティアダウン'
+    template_setting = 'テンプレート'
+    tags_setting = 'タグ'
+    timeout_setting = 'タイムアウト'
+    arguments_setting = '引数'
+    given_prefixes = ['仮定', '指定', '前提条件']
+    when_prefixes = ['条件', '次の場合', 'もし', '実行条件']
+    then_prefixes = ['アクション', 'その時', '動作']
+    and_prefixes = ['および', '及び', 'かつ', '且つ', 'ならびに', '並びに', 'そして', 'それから']
+    but_prefixes = ['ただし', '但し']
+    true_strings = ['真', '有効', 'はい', 'オン']
+    false_strings = ['偽', '無効', 'いいえ', 'オフ']

{robotframework-7.0rc2 → robotframework-7.0.1}/src/robot/htmldata/rebot/common.css

@@ -6,6 +6,7 @@
     --link-color: #15c;
     --link-hover-color: #61c;
     --highlight-color: #eee;
+    --target-color: #f9f9f9;
     --pass-color: #97bd61;
     --fail-color: #ce3e01;
     --warn-color: #fed84f;
@@ -28,6 +29,7 @@
     --link-color: #8cc4ff;
     --link-hover-color: #bb86fc;
     --highlight-color: #002b36;
+    --target-color: #1a252e;
     --pass-link-color: #97bd61;
     --warn-link-color: #fed84f;
     --fail-link-color: #ff9b8f;
@@ -343,3 +345,18 @@ th.stats-col-graph:hover {
 [data-theme="light"] .dark-mode-icon {
     display: block;
 }
+
+@keyframes highlight {
+    0% {
+        background: var(--primary-color)
+    }
+    100% {
+        background: var(--target-color);
+    }
+}
+
+:target {
+    background: var(--target-color);
+    transition: background 0.3s;
+    animation: highlight 4s;
+}

{robotframework-7.0rc2 → robotframework-7.0.1}/src/robot/htmldata/rebot/log.html

@@ -91,31 +91,6 @@ function drawErrorsRecursively(errors, target) {
         // Errors may have moved scroll position. Resetting location re-scrolls.
         if (window.location.hash)
             window.location.replace(window.location.hash);
-        highlightLinkTarget();
-    }
-}
-
-function highlightLinkTarget() {
-    if (window.location.hash) {
-        var target = $(window.location.hash);
-        highlight(target);
-    }
-}
-
-function highlight(element, color) {
-    var darkMode = theme.getPreference() === 'dark';
-    var startingColor = darkMode ? 52 : 242;
-    var endingColor = darkMode ? 39 : 255;
-
-    if (color === undefined)
-        color = startingColor;
-
-    if (color > endingColor) {
-        element.css({'background-color': 'rgb('+color+','+color+','+color+')'});
-        color = darkMode ? color - 2 : color + 2;
-        setTimeout(function () { highlight(element, color); }, 300);
-    } else {
-        element.css({'background-color': ''});
     }
 }
 
@@ -133,7 +108,6 @@ function makeElementVisible(id) {
             expandFailed(window.testdata.findLoaded(util.last(ids)));
             window.location.hash = id;
             document.getElementById(id).scrollIntoView();
-            highlightLinkTarget();
         }
     });
 }

{robotframework-7.0rc2 → robotframework-7.0.1}/src/robot/libdocpkg/jsonbuilder.py

@@ -109,7 +109,7 @@ class JsonDocBuilder:
         if data.get('typedoc'):
             type_docs[data['name']] = data['typedoc']
         nested = [self._parse_type_info(typ, type_docs) for typ in data.get('nested', ())]
-        return TypeInfo(data['name'], None, nested=nested)
+        return TypeInfo(data['name'], None, nested=nested or None)
 
     def _parse_legacy_type_info(self, types):
         return TypeInfo.from_sequence(types) if types else None

{robotframework-7.0rc2 → robotframework-7.0.1}/src/robot/libdocpkg/model.py

@@ -212,5 +212,5 @@ class KeywordDoc(Sortable):
             return None
         return {'name': type.name,
                 'typedoc': type_docs.get(type.name),
-                'nested': [self._type_to_dict(t, type_docs) for t in type.nested],
+                'nested': [self._type_to_dict(t, type_docs) for t in type.nested or ()],
                 'union': type.is_union}

{robotframework-7.0rc2 → robotframework-7.0.1}/src/robot/libdocpkg/robotbuilder.py

@@ -89,7 +89,7 @@ class LibraryDocBuilder:
     def _yield_infos(self, info: TypeInfo):
         if not info.is_union:
             yield info
-        for nested in info.nested:
+        for nested in info.nested or ():
             yield from self._yield_infos(nested)
 
 

{robotframework-7.0rc2 → robotframework-7.0.1}/src/robot/libdocpkg/xmlbuilder.py

@@ -119,7 +119,7 @@ class XmlDocBuilder:
             type_docs[name] = type_elem.get('typedoc')
         nested = [self._parse_type_info(child, type_docs)
                   for child in type_elem.findall('type')]
-        return TypeInfo(name, None, nested=nested)
+        return TypeInfo(name, None, nested=nested or None)
 
     def _parse_legacy_type_info(self, type_elems, type_docs):
         types = []

{robotframework-7.0rc2 → robotframework-7.0.1}/src/robot/libraries/BuiltIn.py

@@ -17,6 +17,7 @@ import difflib
 import re
 import time
 from collections import OrderedDict
+from collections.abc import Sequence
 
 from robot.api import logger, SkipExecution
 from robot.api.deco import keyword
@@ -1540,12 +1541,15 @@ class _Variables(_BuiltInBase):
         value = variables[name]
         try:
             if name[0] == '@':
-                value = list(value)
+                if isinstance(value, Sequence):
+                    value = list(value)
+                else:    # Don't consume iterables.
+                    name = '$' + name[1:]
             if name[0] == '&':
                 value = OrderedDict(value)
         except RERAISED_EXCEPTIONS:
             raise
-        except:
+        except Exception:
             name = '$' + name[1:]
         return name, value
 
@@ -3219,12 +3223,12 @@ class _Misc(_BuiltInBase):
         operating systems.
 
         It is possible to pass arguments to the imported library and also
-        named argument syntax works if the library supports it. ``WITH NAME``
+        named argument syntax works if the library supports it. ``AS``
         syntax can be used to give a custom name to the imported library.
 
         Examples:
         | Import Library | MyLibrary |
-        | Import Library | ${CURDIR}/Lib.py | arg1 | named=arg2 | WITH NAME | Custom |
+        | Import Library | ${CURDIR}/Lib.py | arg1 | named=arg2 | AS | Custom |
         """
         args, alias = self._split_alias(args)
         try:

{robotframework-7.0rc2 → robotframework-7.0.1}/src/robot/libraries/Collections.py

@@ -18,12 +18,15 @@ from ast import literal_eval
 from itertools import chain
 
 from robot.api import logger
-from robot.utils import (get_error_message, is_dict_like, is_list_like, Matcher,
-                         NOT_SET, plural_or_not as s, seq2str, seq2str2, type_name)
+from robot.utils import (is_dict_like, is_list_like, Matcher, NotSet,
+                         plural_or_not as s, seq2str, seq2str2, type_name)
 from robot.utils.asserts import assert_equal
 from robot.version import get_version
 
 
+NOT_SET = NotSet()
+
+
 class _List:
 
     def convert_to_list(self, item):
@@ -1124,7 +1127,6 @@ def _report_error(default_message, message, values=False):
 class Normalizer:
 
     def __init__(self, ignore_case=False, ignore_order=False, ignore_keys=None):
-        print(ignore_case)
         self.ignore_case = ignore_case
         if isinstance(ignore_case, str):
             self.ignore_key_case = ignore_case.upper() not in ('VALUE', 'VALUES')

{robotframework-7.0rc2 → robotframework-7.0.1}/src/robot/libraries/String.py

@@ -644,9 +644,9 @@ class String:
 
         Examples:
         | ${ignore first} = | Get Substring | ${string} | 1  |    |
-        | ${ignore last} =  | Get Substring | ${string} |    | -1 |
+        | ${ignore last} =  | Get Substring | ${string} | 0  | -1 |
         | ${5th to 10th} =  | Get Substring | ${string} | 4  | 10 |
-        | ${first two} =    | Get Substring | ${string} |    | 1  |
+        | ${first two} =    | Get Substring | ${string} | 0  | 1  |
         | ${last two} =     | Get Substring | ${string} | -2 |    |
         """
         start = self._convert_to_index(start, 'start')

{robotframework-7.0rc2 → robotframework-7.0.1}/src/robot/libraries/XML.py

@@ -94,8 +94,6 @@ class XML:
     escaped by doubling it (``\\\\``). Using the built-in variable ``${/}``
     naturally works too.
 
-    Note: Support for XML as bytes is new in Robot Framework 3.2.
-
     = Using lxml =
 
     By default, this library uses Python's standard
@@ -432,8 +430,6 @@ class XML:
     | `Parse XML` | ${XML} | keep_clark_notation=${EMPTY} | # Empty string is false.       |
     | `Parse XML` | ${XML} | keep_clark_notation=${FALSE} | # Python ``False`` is false.   |
 
-    Considering ``OFF`` and ``0`` false is new in Robot Framework 3.1.
-
     == Pattern matching ==
 
     Some keywords, for example `Elements Should Match`, support so called
@@ -449,9 +445,6 @@ class XML:
     Unlike with glob patterns normally, path separator characters ``/`` and
     ``\\`` and the newline character ``\\n`` are matches by the above
     wildcards.
-
-    Support for brackets like ``[abc]`` and ``[!a-z]`` is new in
-    Robot Framework 3.1
     """
     ROBOT_LIBRARY_SCOPE = 'GLOBAL'
     ROBOT_LIBRARY_VERSION = get_version()
@@ -1316,6 +1309,8 @@ class XML:
         See also `Log Element` and `Save XML`.
         """
         source = self.get_element(source, xpath)
+        if self.lxml_etree:
+            source = self._ns_stripper.unstrip(source)
         string = self.etree.tostring(source, encoding='UTF-8').decode('UTF-8')
         string = re.sub(r'^<\?xml .*\?>', '', string).strip()
         if encoding:

{robotframework-7.0rc2 → robotframework-7.0.1}/src/robot/libraries/dialogs_py.py

@@ -26,9 +26,8 @@ class TkDialog(Toplevel):
 
     def __init__(self, message, value=None, **config):
         self._prevent_execution_with_timeouts()
-        self.root = self._get_root()
         self._button_bindings = {}
-        super().__init__(self.root)
+        super().__init__(self._get_root())
         self._initialize_dialog()
         self.widget = self._create_body(message, value, **config)
         self._create_buttons()
@@ -109,8 +108,8 @@ class TkDialog(Toplevel):
         return None
 
     def _close(self, event=None):
-        # self.destroy() is not enough on Linux
-        self.root.destroy()
+        self.destroy()
+        self.update() # Needed on linux to close the window (Issue #1466)
 
     def _right_button_clicked(self, event=None):
         self._result = self._get_right_button_value()

{robotframework-7.0rc2 → robotframework-7.0.1}/src/robot/model/__init__.py

@@ -31,7 +31,7 @@ from .control import (Break, Continue, Error, For, ForIteration, If, IfBranch,
                       Return, Try, TryBranch, Var, While, WhileIteration)
 from .fixture import create_fixture
 from .itemlist import ItemList
-from .keyword import Arguments, Keyword
+from .keyword import Keyword
 from .message import Message, MessageLevel, Messages
 from .modelobject import DataDict, ModelObject
 from .modifier import ModelModifier

{robotframework-7.0rc2 → robotframework-7.0.1}/src/robot/model/configurer.py

@@ -73,7 +73,7 @@ class SuiteConfigurer(SuiteVisitor):
         parts = []
         for separator, explanation, selectors in [
                 (None, 'matching name', self.include_tests),
-                ('or', 'matching tags', self.include_tags),
+                ('and', 'matching tags', self.include_tags),
                 ('and', 'not matching tags', self.exclude_tags)
         ]:
             if selectors:

{robotframework-7.0rc2 → robotframework-7.0.1}/src/robot/model/filter.py

@@ -84,7 +84,7 @@ class Filter(EmptySuiteRemover):
             suite.start_time = suite.end_time = suite.elapsed_time = None
         if self.include_suites is not None:
             return self._filter_based_on_suite_name(suite)
-        suite.tests = [t for t in suite.tests if self._test_included(t)]
+        self._filter_tests(suite)
         return bool(suite.suites)
 
     def _filter_based_on_suite_name(self, suite: 'TestSuite') -> bool:
@@ -96,16 +96,16 @@ class Filter(EmptySuiteRemover):
         suite.tests = []
         return True
 
-    def _test_included(self, test: 'TestCase') -> bool:
+    def _filter_tests(self, suite: 'TestSuite'):
         tests, include, exclude \
                 = self.include_tests, self.include_tags, self.exclude_tags
-        if exclude is not None and exclude.match(test.tags):
-            return False
-        if include is not None and include.match(test.tags):
-            return True
-        if tests is not None and tests.match(test.name, test.full_name):
-            return True
-        return include is None and tests is None
+        t: TestCase
+        if tests is not None:
+            suite.tests = [t for t in suite.tests if tests.match(t.name, t.full_name)]
+        if include is not None:
+            suite.tests = [t for t in suite.tests if include.match(t.tags)]
+        if exclude is not None:
+            suite.tests = [t for t in suite.tests if not exclude.match(t.tags)]
 
     def __bool__(self) -> bool:
         return bool(self.include_suites is not None or