Revert of Fix param_name for Properties.

recipe_engine/loader.py

 # Copyright 2013-2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import collections
 import contextlib
 import imp
 import inspect
 import os
 import sys
@@ skipping 463 matching lines @@
     self._instances = {}
 
   def instantiate(self, mod):
     if mod in self._instances:
       return self._instances[mod]
     deps_dict = { name: self.instantiate(dep)
                   for name, dep in mod.LOADED_DEPS.iteritems() }
     self._instances[mod] = self._instantiator(mod, deps_dict)
     return self._instances[mod]
 
-
 def _invoke_with_properties(callable_obj, all_props, prop_defs, arg_names,
                             **additional_args):
   """Internal version of invoke_with_properties.
 
   The main difference is it gets passed the argument names as `arg_names`.
   This allows us to reuse this logic elsewhere, without defining a fake function
   which has arbitrary argument names.
   """
   for name, prop in prop_defs.items():
     if not isinstance(prop, BoundProperty):
       raise ValueError(
           "You tried to invoke {} with an unbound Property {} named {}".format(
               callable, prop, name))
 
-  # Maps parameter names to property names
-  param_name_mapping = {
-              prop.param_name: name for name, prop in prop_defs.iteritems()}
-
   props = []
-
-  for param_name in arg_names:
-    if param_name in additional_args:
-      props.append(additional_args.pop(param_name))
+  for arg in arg_names:
+    if arg in additional_args:
+      props.append(additional_args.pop(arg))
       continue
 
-    if param_name not in param_name_mapping:
+    if arg not in prop_defs:
       raise UndefinedPropertyException(
-        "Missing property definition for parameter '{}'.".format(param_name))
+        "Missing property definition for '{}'.".format(arg))
 
-    prop_name = param_name_mapping[param_name]
-
-    if prop_name not in prop_defs:
-      raise UndefinedPropertyException(
-        "Missing property value for '{}'.".format(prop_name))
-
-    prop = prop_defs[prop_name]
+    prop = prop_defs[arg]
     props.append(prop.interpret(all_props.get(
-      prop_name, PROPERTY_SENTINEL)))
+      prop.param_name, PROPERTY_SENTINEL)))
 
   return callable_obj(*props, **additional_args)
 
-
 def invoke_with_properties(callable_obj, all_props, prop_defs,
                            **additional_args):
   """
   Invokes callable with filtered, type-checked properties.
 
   Args:
     callable_obj: The function to call, or class to instantiate.
                   This supports passing in either RunSteps, or a recipe module,
                   which is a class.
-    all_props: A dictionary containing all the properties (strings) currently
-               defined in the system.
-    prop_defs: A dictionary of property name to property definitions
-               (BoundProperty) for this callable.
+    all_props: A dictionary containing all the properties (instances of BoundProperty)
+               currently defined in the system.
+    prop_defs: A dictionary of name to property definitions for this callable.
     additional_args: kwargs to pass through to the callable.
                      Note that the names of the arguments can correspond to
                      positional arguments as well.
 
   Returns:
     The result of calling callable with the filtered properties
     and additional arguments.
   """
   # Check that we got passed BoundProperties, and not Properties
 
@@ skipping 44 matching lines @@
     modapi = (getattr(mod, 'TEST_API', None) or RecipeTestApi)(module=mod)
     for k,v in deps.iteritems():
       setattr(modapi.m, k, v)
     return modapi
 
   mapper = DependencyMapper(instantiator)
   api = RecipeTestApi(module=None)
   for k,v in toplevel_deps.iteritems():
     setattr(api, k, mapper.instantiate(v))
   return api