[step] Remove config indirection.

recipe_engine/step_runner.py

 # Copyright 2016 The LUCI Authors. All rights reserved.
 # Use of this source code is governed under the Apache License, Version 2.0
 # that can be found in the LICENSE file.
 
 import calendar
 import collections
 import contextlib
 import datetime
 import itertools
 import json
@@ skipping 74 matching lines @@
     """Return the stream engine that this StepRunner uses, if meaningful.
 
     Users of this method must be prepared to handle None.
     """
     return None
 
   def open_step(self, step_config):
     """Constructs an OpenStep object which can be used to actually run a step.
 
     Args:
-      step_config (StepConfig): The step data.
+      step_config (recipe_api.StepClient.StepConfig): The step data.
 
     Returns: an OpenStep object.
     """
     raise NotImplementedError()
 
   def run_recipe(self, universe, recipe, properties):
     """Run the recipe named |recipe|.
 
     Args:
       universe: The RecipeUniverse where the recipe lives.
@@ skipping 436 matching lines @@
       for name, rs in self._step_history.iteritems())
 
 
 # Placeholders associated with a rendered step.
 Placeholders = collections.namedtuple('Placeholders',
     ('inputs_cmd', 'outputs_cmd', 'stdout', 'stderr', 'stdin'))
 
 # Result of 'render_step'.
 #
 # Fields:
-#   config (recipe_api.StepConfig): The step configuration.
+#   config (recipe_api.StepClient.StepConfig): The step configuration.
 #   placeholders (Placeholders): Placeholders for this rendered step.
 #   followup_annotations (list): A list of followup annotation, populated during
 #       simulation test.
 RenderedStep = collections.namedtuple('RenderedStep',
     ('config', 'placeholders', 'followup_annotations'))
 
 
 # Singleton object to indicate a value is not set.
 UNSET_VALUE = object()
 
 
 def render_step(step_config, step_test):
   """Renders a step so that it can be fed to annotator.py.
 
   Args:
-    step_config (StepConfig): The step config to render.
+    step_config (recipe_api.StepClient.StepConfig): The step config to render.
     step_test: The test data json dictionary for this step, if any.
                Passed through unaltered to each placeholder.
 
   Returns (RenderedStep): the rendered step, including a Placeholders object
       representing any placeholder instances that were found while rendering.
   """
   # Process 'cmd', rendering placeholders there.
   input_phs = collections.defaultdict(lambda: collections.defaultdict(list))
   output_phs = collections.defaultdict(
       lambda: collections.defaultdict(collections.OrderedDict))
@@ skipping 209 matching lines @@
   supplied command, and only uses the |env| kwarg for modifying the environment
   of the child process.
   """
   saved_path = os.environ['PATH']
   try:
     if path is not None:
       os.environ['PATH'] = path
     yield
   finally:
     os.environ['PATH'] = saved_path