Implemented some requested changes from code review.

mihaiparvu · mihaiparvu · commit 34b68255ae32 · 2019-10-23T14:20:58.000+03:00
diff --git a/atest/interpreter.py b/atest/interpreter.py
@@ -26,7 +26,7 @@ def __init__(self, path, name=None, version=None):
         self.path = path
         self.interpreter = self._get_interpreter(path)
         if not name:
-            name, version = 'Python', '2.7'
+            name, version = self._get_name_and_version()
         self.name = name
         self.version = version
         self.version_info = tuple(int(item) for item in version.split('.'))
@@ -55,10 +55,6 @@ def os(self):
                 return name
         return sys.platform
 
-    @property
-    def output_name(self):
-        return '{i.name}-{i.version}-{i.os}'.format(i=self).replace(' ', '')
-
     @property
     def excludes(self):
         if self.is_jython:
diff --git a/atest/run.py b/atest/run.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3.6
 
 """A script for running Robot Framework's acceptance tests.
 
@@ -43,15 +43,15 @@
 
 
 sys.path.append(join(CURDIR, '..'))
-# try:
-#     from tasks import jar
-# except ImportError:
-#     def jar(*args, **kwargs):
-#         raise RuntimeError("Dependencies missing. See BUILD.rst for details.")
-# except AssertionError:
-#     def jar(*args, **kwargs):
-#         raise RuntimeError("JAR can be created only when in the project root. "
-#                            "See BUILD.rst for details.")
+try:
+    from tasks import jar
+except ImportError:
+    def jar(*args, **kwargs):
+        raise RuntimeError("Dependencies missing. See BUILD.rst for details.")
+except AssertionError:
+    def jar(*args, **kwargs):
+        raise RuntimeError("JAR can be created only when in the project root. "
+                           "See BUILD.rst for details.")
 
 
 ARGUMENTS = '''
@@ -81,7 +81,7 @@ def atests(interpreter, *arguments):
 
 
 def _get_directories(interpreter):
-    name = interpreter.output_name
+    name = '{i.name}-{i.version}-{i.os}'.format(i=interpreter).replace(' ', '')
     outputdir = dos_to_long(join(CURDIR, 'results', name))
     tempdir = dos_to_long(join(tempfile.gettempdir(), 'robottests', name))
     if exists(outputdir):
diff --git a/atest/testdata/keywords/embedded_arguments.robot b/atest/testdata/keywords/embedded_arguments.robot
@@ -45,7 +45,6 @@ Embedded Arguments as Lists
 Embedded Arguments as Dicts
     Key x is in {"a": "b", "x": "y"}
 
-
 Non-Existing Variable in Embedded Arguments
     [Documentation]    FAIL Variable '${non existing}' not found.
     User ${non existing} Selects ${variables} From Webshop
@@ -293,4 +292,4 @@ Sublist @{sublist} is in @{list}
      List Should Contain Sub List    ${list}    ${sublist}
 
 Key ${key} is in &{dictionary}
-     Dictionary Should Contain Key    ${dictionary}    ${key}
+     Dictionary Should Contain Key    ${dictionary}    ${key}
diff --git a/src/robot/running/arguments/embedded.py b/src/robot/running/arguments/embedded.py
@@ -25,9 +25,9 @@ class EmbeddedArguments(object):
 
     def __init__(self, name):
         if '${' in name or '@{' in name or '&{' in name:
-            self.var_type, self.name, self.args = EmbeddedArgumentParser().parse(name)
+            self.name, self.args = EmbeddedArgumentParser().parse(name)
         else:
-            self.var_type, self.name, self.args = None, None, []
+            self.name, self.args = None, []
 
     def __nonzero__(self):
         return self.name is not None
@@ -42,17 +42,15 @@ class EmbeddedArgumentParser(object):
     _variable_pattern = r'\$\{[^\}]+\}'
 
     def parse(self, string):
-        var_type = None
         args = []
         name_regexp = ['^']
         for before, variable, string in VariableIterator(string, identifiers='$@&'):
             name, pattern = self._get_name_and_pattern(variable[2:-1])
-            args.append(name)
+            args.append((variable[0], name))
             name_regexp.extend([re.escape(before), '(%s)' % pattern])
-            var_type = variable[0]
         name_regexp.extend([re.escape(string), '$'])
         name = self._compile_regexp(name_regexp) if args else None
-        return var_type, name, args
+        return name, args
 
     def _get_name_and_pattern(self, name):
         if ':' not in name:
diff --git a/src/robot/running/userkeyword.py b/src/robot/running/userkeyword.py
@@ -104,7 +104,6 @@ class EmbeddedArgumentsHandler(UserKeywordHandler):
     def __init__(self, keyword, libname, embedded):
         UserKeywordHandler.__init__(self, keyword, libname)
         self.keyword = keyword
-        self.embedded_type = embedded.var_type
         self.embedded_name = embedded.name
         self.embedded_args = embedded.args
 
diff --git a/src/robot/running/userkeywordrunner.py b/src/robot/running/userkeywordrunner.py
@@ -228,7 +228,9 @@ def __init__(self, handler, name):
         match = handler.embedded_name.match(name)
         if not match:
             raise ValueError('Does not match given name')
-        self.embedded_args = list(zip(handler.embedded_type, handler.embedded_args, match.groups()))
+        self.embedded_args = []
+        for n, v in zip(handler.embedded_args, match.groups()):
+            self.embedded_args.append(n + (v,))
 
     def _resolve_arguments(self, args, variables=None):
         # Validates that no arguments given.
@@ -238,12 +240,13 @@ def _resolve_arguments(self, args, variables=None):
         return list(self._replace(variables))
 
     def _replace(self, variables):
-        for t, n, v in self.embedded_args:
-            if t == '&' and is_dict_like(literal_eval(v)):
-                yield n, DotDict(literal_eval(v))
-            elif t == '@' and is_list_like(literal_eval(v)):
-                yield n, variables.replace_list(literal_eval(v))
-            yield n, variables.replace_scalar(v)
+        for var_type, name, value in self.embedded_args:
+            if var_type == '$':
+                yield name, variables.replace_scalar(value)
+            elif var_type == '@' and is_list_like(literal_eval(value)):
+                yield name, variables.replace_list(literal_eval(value))
+            elif var_type == '&' and is_dict_like(literal_eval(value)):
+                yield name, DotDict(literal_eval(value))
 
     def _set_arguments(self, embedded_args, context):
         variables = context.variables
