robotframework 7.1__zip → 7.1rc1__zip

{robotframework-7.1/src/robotframework.egg-info → robotframework-7.1rc1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: robotframework
-Version: 7.1
+Version: 7.1rc1
 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.1.rst
+Project-URL: Release Notes, https://github.com/robotframework/robotframework/blob/master/doc/releasenotes/rf-7.1rc1.rst
 Project-URL: Slack, http://slack.robotframework.org
 Description: Robot Framework
         ===============

{robotframework-7.1 → robotframework-7.1rc1}/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.1'
+VERSION = '7.1rc1'
 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.1 → robotframework-7.1rc1}/src/robot/conf/settings.py

@@ -68,7 +68,6 @@ class _BaseSettings:
                  'PreRebotModifiers': ('prerebotmodifier', []),
                  'StatusRC'         : ('statusrc', True),
                  'ConsoleColors'    : ('consolecolors', 'AUTO'),
-                 'ConsoleLinks'     : ('consolelinks', 'AUTO'),
                  'PythonPath'       : ('pythonpath', []),
                  'StdOut'           : ('stdout', None),
                  'StdErr'           : ('stderr', None)}
@@ -455,10 +454,6 @@ class _BaseSettings:
     def console_colors(self):
         return self['ConsoleColors']
 
-    @property
-    def console_links(self):
-        return self['ConsoleLinks']
-
     @property
     def rpa(self):
         return self['RPA']
@@ -618,7 +613,6 @@ class RobotSettings(_BaseSettings):
             'type':    self.console_type,
             'width':   self.console_width,
             'colors':  self.console_colors,
-            'links': self.console_links,
             'markers': self.console_markers,
             'stdout':  self['StdOut'],
             'stderr':  self['StdErr']
@@ -742,7 +736,6 @@ class RebotSettings(_BaseSettings):
     def console_output_config(self):
         return {
             'colors':  self.console_colors,
-            'links': self.console_links,
             'stdout':  self['StdOut'],
             'stderr':  self['StdErr']
         }

{robotframework-7.1 → robotframework-7.1rc1}/src/robot/htmldata/template.py

@@ -20,6 +20,8 @@ from pathlib import Path
 
 
 if sys.version_info < (3, 9) and not Path(__file__).exists():    # zipsafe
+    # `importlib.resources.files` is new in Python 3.9, but that version does
+    # not seem to be compatible with zipapp.
     try:
         from importlib_resources import files
     except ImportError:

{robotframework-7.1 → robotframework-7.1rc1}/src/robot/libraries/Collections.py

@@ -455,8 +455,9 @@ class _List:
         normalize = Normalizer(ignore_case).normalize
         list1 = normalize(list1)
         list2 = normalize(list2)
-        diffs = [item for item in list2 if item not in list1]
-        _verify_condition(not diffs, f'Following values are missing: {seq2str(diffs)}',
+        diffs = ', '.join(str(item) for item in list2 if item not in list1)
+        _verify_condition(not diffs,
+                          f'Following values were not found from first list: {diffs}',
                           msg, values)
 
     def log_list(self, list_, level='INFO'):

{robotframework-7.1 → robotframework-7.1rc1}/src/robot/output/console/__init__.py

@@ -20,13 +20,13 @@ from .quiet import NoOutput, QuietOutput
 from .verbose import VerboseOutput
 
 
-def ConsoleOutput(type='verbose', width=78, colors='AUTO', links='AUTO', markers='AUTO',
+def ConsoleOutput(type='verbose', width=78, colors='AUTO', markers='AUTO',
                   stdout=None, stderr=None):
     upper = type.upper()
     if upper == 'VERBOSE':
-        return VerboseOutput(width, colors, links, markers, stdout, stderr)
+        return VerboseOutput(width, colors, markers, stdout, stderr)
     if upper == 'DOTTED':
-        return DottedOutput(width, colors, links, stdout, stderr)
+        return DottedOutput(width, colors, stdout, stderr)
     if upper == 'QUIET':
         return QuietOutput(colors, stderr)
     if upper == 'NONE':

{robotframework-7.1 → robotframework-7.1rc1}/src/robot/output/console/dotted.py

@@ -25,10 +25,10 @@ from ..loggerapi import LoggerApi
 
 class DottedOutput(LoggerApi):
 
-    def __init__(self, width=78, colors='AUTO', links='AUTO', stdout=None, stderr=None):
+    def __init__(self, width=78, colors='AUTO', stdout=None, stderr=None):
         self.width = width
-        self.stdout = HighlightingStream(stdout or sys.__stdout__, colors, links)
-        self.stderr = HighlightingStream(stderr or sys.__stderr__, colors, links)
+        self.stdout = HighlightingStream(stdout or sys.__stdout__, colors)
+        self.stderr = HighlightingStream(stderr or sys.__stderr__, colors)
         self.markers_on_row = 0
 
     def start_suite(self, data, result):

{robotframework-7.1 → robotframework-7.1rc1}/src/robot/output/console/highlighting.py

@@ -42,11 +42,11 @@ from robot.utils import console_encode, isatty, WINDOWS
 
 class HighlightingStream:
 
-    def __init__(self, stream, colors='AUTO', links='AUTO'):
+    def __init__(self, stream, colors='AUTO'):
         self.stream = stream
-        self._highlighter = self._get_highlighter(stream, colors, links)
+        self._highlighter = self._get_highlighter(stream, colors)
 
-    def _get_highlighter(self, stream, colors, links):
+    def _get_highlighter(self, stream, colors):
         options = {'AUTO': Highlighter if isatty(stream) else NoHighlighting,
                    'ON': Highlighter,
                    'OFF': NoHighlighting,
@@ -54,12 +54,9 @@ class HighlightingStream:
         try:
             highlighter = options[colors.upper()]
         except KeyError:
-            raise DataError(f"Invalid console color value '{colors}'. "
-                            f"Available 'AUTO', 'ON', 'OFF' and 'ANSI'.")
-        if links.upper() not in ('AUTO', 'OFF'):
-            raise DataError(f"Invalid console link value '{links}. "
-                            f"Available 'AUTO' and 'OFF'.")
-        return highlighter(stream, links.upper() == 'AUTO')
+            raise DataError("Invalid console color value '%s'. Available "
+                            "'AUTO', 'ON', 'OFF' and 'ANSI'." % colors)
+        return highlighter(stream)
 
     def write(self, text, flush=True):
         self._write(console_encode(text, stream=self.stream))
@@ -123,13 +120,13 @@ class HighlightingStream:
         self.write(f"{kind + ':':8} {path}\n")
 
 
-def Highlighter(stream, links=True):
+def Highlighter(stream):
     if os.sep == '/':
-        return AnsiHighlighter(stream, links)
+        return AnsiHighlighter(stream)
     if not windll:
         return NoHighlighting(stream)
     if virtual_terminal_enabled(stream):
-        return AnsiHighlighter(stream, links)
+        return AnsiHighlighter(stream)
     return DosHighlighter(stream)
 
 
@@ -139,9 +136,8 @@ class AnsiHighlighter:
     YELLOW = '\033[33m'
     RESET = '\033[0m'
 
-    def __init__(self, stream, links=True):
+    def __init__(self, stream):
         self._stream = stream
-        self._links = links
 
     def green(self):
         self._set_color(self.GREEN)
@@ -156,15 +152,7 @@ class AnsiHighlighter:
         self._set_color(self.RESET)
 
     def link(self, path):
-        if not self._links:
-            return path
-        try:
-            uri = path.as_uri()
-        except ValueError:
-            return path
-        # Terminal hyperlink syntax is documented here:
-        # https://gist.github.com/egmontkob/eb114294efbcd5adb1944c9f3cb5feda
-        return f'\033]8;;{uri}\033\\{path}\033]8;;\033\\'
+        return f'\033]8;;file:///{path}\033\\{path}\033]8;;\033\\'
 
     def _set_color(self, color):
         self._stream.write(color)

{robotframework-7.1 → robotframework-7.1rc1}/src/robot/output/console/verbose.py

@@ -24,9 +24,9 @@ from ..loggerapi import LoggerApi
 
 class VerboseOutput(LoggerApi):
 
-    def __init__(self, width=78, colors='AUTO', links='AUTO', markers='AUTO',
-                 stdout=None, stderr=None):
-        self.writer = VerboseWriter(width, colors, links, markers, stdout, stderr)
+    def __init__(self, width=78, colors='AUTO', markers='AUTO', stdout=None,
+                 stderr=None):
+        self.writer = VerboseWriter(width, colors, markers, stdout, stderr)
         self.started = False
         self.started_keywords = 0
         self.running_test = False
@@ -73,11 +73,11 @@ class VerboseOutput(LoggerApi):
 class VerboseWriter:
     _status_length = len('| PASS |')
 
-    def __init__(self, width=78, colors='AUTO', links='AUTO', markers='AUTO',
-                 stdout=None, stderr=None):
+    def __init__(self, width=78, colors='AUTO', markers='AUTO', stdout=None,
+                 stderr=None):
         self.width = width
-        self.stdout = HighlightingStream(stdout or sys.__stdout__, colors, links)
-        self.stderr = HighlightingStream(stderr or sys.__stderr__, colors, links)
+        self.stdout = HighlightingStream(stdout or sys.__stdout__, colors)
+        self.stderr = HighlightingStream(stderr or sys.__stderr__, colors)
         self._keyword_marker = KeywordMarker(self.stdout, markers)
         self._last_info = None
 

{robotframework-7.1 → robotframework-7.1rc1}/src/robot/output/logger.py

@@ -104,8 +104,8 @@ class Logger(AbstractLogger):
             self.close()
 
     def register_console_logger(self, type='verbose', width=78, colors='AUTO',
-                                links='AUTO', markers='AUTO', stdout=None, stderr=None):
-        logger = ConsoleOutput(type, width, colors, links, markers, stdout, stderr)
+                                markers='AUTO', stdout=None, stderr=None):
+        logger = ConsoleOutput(type, width, colors, markers, stdout, stderr)
         self._console_logger = self._wrap_and_relay(logger)
 
     def _wrap_and_relay(self, logger):

{robotframework-7.1 → robotframework-7.1rc1}/src/robot/rebot.py

@@ -262,9 +262,6 @@ Options
                           on:   always use colors
                           ansi: like `on` but use ANSI colors also on Windows
                           off:  disable colors altogether
-    --consolelinks auto|off  Control making paths to results files hyperlinks.
-                          auto: use links when colors are enabled (default)
-                          off: disable links unconditionally
  -P --pythonpath path *   Additional locations to add to the module search path
                           that is used when importing Python based extensions.
  -A --argumentfile path *  Text file to read more arguments from. File can have

{robotframework-7.1 → robotframework-7.1rc1}/src/robot/run.py

@@ -341,9 +341,6 @@ Options
                           on:   always use colors
                           ansi: like `on` but use ANSI colors also on Windows
                           off:  disable colors altogether
-    --consolelinks auto|off  Control making paths to results files hyperlinks.
-                          auto: use links when colors are enabled (default)
-                          off: disable links unconditionally
  -K --consolemarkers auto|on|off  Show markers on the console when top level
                           keywords in a test case end. Values have same
                           semantics as with --consolecolors.

{robotframework-7.1 → robotframework-7.1rc1}/src/robot/running/bodyrunner.py

@@ -383,6 +383,7 @@ class WhileRunner:
         ctx = self._context
         error = None
         run = False
+        limit = None
         result.start_time = datetime.now()
         iter_result = result.body.create_iteration(start_time=datetime.now())
         if self._run:
@@ -390,17 +391,15 @@ class WhileRunner:
                 error = DataError(data.error, syntax=True)
             elif not ctx.dry_run:
                 try:
+                    limit = WhileLimit.create(data.limit,
+                                              data.on_limit,
+                                              data.on_limit_message,
+                                              ctx.variables)
                     run = self._should_run(data.condition, ctx.variables)
                 except DataError as err:
                     error = err
         with StatusReporter(data, result, self._context, run):
             iter_data = data.get_iteration()
-            if run:
-                try:
-                    limit = WhileLimit.create(data, ctx.variables)
-                except DataError as err:
-                    error = err
-                    run = False
             if ctx.dry_run or not run:
                 self._run_iteration(iter_data, iter_result, run)
                 if error:
@@ -652,34 +651,29 @@ class WhileLimit:
         self.on_limit_message = on_limit_message
 
     @classmethod
-    def create(cls, data, variables):
-        limit = cls._parse_limit(data.limit, variables)
-        on_limit = cls._parse_on_limit(data.on_limit, variables)
-        on_limit_msg = cls._parse_on_limit_message(data.on_limit_message, variables)
+    def create(cls, limit, on_limit, on_limit_message, variables):
+        if on_limit_message:
+            try:
+                on_limit_message = variables.replace_string(on_limit_message)
+            except DataError as err:
+                raise DataError(f"Invalid WHILE loop 'on_limit_message': '{err}")
+        on_limit = cls._parse_on_limit(variables, on_limit)
         if not limit:
-            return IterationCountLimit(DEFAULT_WHILE_LIMIT, on_limit, on_limit_msg)
+            return IterationCountLimit(DEFAULT_WHILE_LIMIT, on_limit, on_limit_message)
+        limit = variables.replace_string(limit)
         if limit.upper() == 'NONE':
             return NoLimit()
         try:
             count = cls._parse_limit_as_count(limit)
         except ValueError:
             seconds = cls._parse_limit_as_timestr(limit)
-            return DurationLimit(seconds, on_limit, on_limit_msg)
+            return DurationLimit(seconds, on_limit, on_limit_message)
         else:
-            return IterationCountLimit(count, on_limit, on_limit_msg)
+            return IterationCountLimit(count, on_limit, on_limit_message)
 
     @classmethod
-    def _parse_limit(cls, limit, variables):
-        if not limit:
-            return None
-        try:
-            return variables.replace_string(limit)
-        except DataError as err:
-            raise DataError(f"Invalid WHILE loop limit: {err}")
-
-    @classmethod
-    def _parse_on_limit(cls, on_limit, variables):
-        if not on_limit:
+    def _parse_on_limit(cls, variables, on_limit):
+        if on_limit is None:
             return None
         try:
             on_limit = variables.replace_string(on_limit)
@@ -688,16 +682,7 @@ class WhileLimit:
             raise DataError(f"Value '{on_limit}' is not accepted. Valid values "
                             f"are 'PASS' and 'FAIL'.")
         except DataError as err:
-            raise DataError(f"Invalid WHILE loop 'on_limit': {err}")
-
-    @classmethod
-    def _parse_on_limit_message(cls, on_limit_message, variables):
-        if not on_limit_message:
-            return None
-        try:
-            return variables.replace_string(on_limit_message)
-        except DataError as err:
-            raise DataError(f"Invalid WHILE loop 'on_limit_message': '{err}")
+            raise DataError(f"Invalid WHILE loop 'on_limit' value: {err}")
 
     @classmethod
     def _parse_limit_as_count(cls, limit):

{robotframework-7.1 → robotframework-7.1rc1}/src/robot/variables/scopes.py

@@ -192,8 +192,7 @@ class GlobalVariables(Variables):
                                 'include': Tags(settings.include),
                                 'exclude': Tags(settings.exclude),
                                 'skip': Tags(settings.skip),
-                                'skip_on_failure': Tags(settings.skip_on_failure),
-                                'console_width': settings.console_width
+                                'skip_on_failure': Tags(settings.skip_on_failure)
                             })),
                             ('${/}', os.sep),
                             ('${:}', os.pathsep),

{robotframework-7.1 → robotframework-7.1rc1}/src/robot/version.py

@@ -18,7 +18,7 @@ import sys
 
 # Version number typically updated by running `invoke set-version <version>`.
 # Run `invoke --help set-version` or see tasks.py for details.
-VERSION = '7.1'
+VERSION = '7.1rc1'
 
 
 def get_version(naked=False):

{robotframework-7.1 → robotframework-7.1rc1/src/robotframework.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: robotframework
-Version: 7.1
+Version: 7.1rc1
 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.1.rst
+Project-URL: Release Notes, https://github.com/robotframework/robotframework/blob/master/doc/releasenotes/rf-7.1rc1.rst
 Project-URL: Slack, http://slack.robotframework.org
 Description: Robot Framework
         ===============