Changed recipe_modules base paths to be abstract entities in their own right.

scripts/slave/recipe_modules/path/api.py

 # Copyright 2013 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 functools
 import os
+import sys
 import tempfile
 
 from slave import recipe_api
 from slave import recipe_config_types
 
 
-def PathTostring(api, test):
-  def PathTostring_inner(path):
+def PathToString(api, test):
+  def PathToString_inner(path):
     assert isinstance(path, recipe_config_types.Path)
     base_path = None
     suffix = path.platform_ext.get(api.m.platform.name, '')
-    if path.base in api.c.dynamic_paths:
-      base_path = api.c.dynamic_paths[path.base]
-    elif path.base in api.c.base_paths:
+    if isinstance(path.base, recipe_config_types.NamedBasePath):
+      name = path.base.name
+      if name in api.c.dynamic_paths:
+        base_path = api.c.dynamic_paths[name]
+      elif name in api.c.base_paths:
+        if test.enabled:
+          base_path = repr(path.base)
+        else:  # pragma: no cover
+          base_path = api.join(*api.c.base_paths[name])
+    elif isinstance(path.base, recipe_config_types.ModuleBasePath):
       if test.enabled:
-        base_path = '[%s]' % path.base.upper()
+        base_path = repr(path.base)
       else:  # pragma: no cover
-        base_path = api.join(*api.c.base_paths[path.base])
+        base_path = os.path.dirname(path.base.module.__file__)
+    else:  # pragma: no cover
+      raise NotImplementedError('PathToString not implemented for %s' %
+                                path.base.__class__.__name__)
     assert base_path, 'Could not get base %r for path' % path.base
     return api.join(base_path, *path.pieces) + suffix
-  return PathTostring_inner
+  return PathToString_inner
 
 
 def string_filter(func):
   @functools.wraps(func)
   def inner(*args, **kwargs):
     return func(*map(str, args), **kwargs)
   return inner
 
 
 class path_set(object):
@@ skipping 99 matching lines @@
 
   def get_config_defaults(self):
     return {
       'CURRENT_WORKING_DIR': self._startup_cwd,
       'TEMP_DIR': self._temp_dir,
     }
 
   def __init__(self, **kwargs):
     super(PathApi, self).__init__(**kwargs)
     recipe_config_types.Path.set_tostring_fn(
-      PathTostring(self, self._test_data))
+      PathToString(self, self._test_data))
 
     # Used in mkdtemp when generating and checking expectations.
     self._test_counter = 0
 
     if not self._test_data.enabled:  # pragma: no cover
       self._path_mod = os.path
       # Capture the cwd on process start to avoid shenanigans.
       self._startup_cwd = _split_path(os.getcwd())
       # Use default system wide temp dir as a root temp dir.
       self._temp_dir = _split_path(tempfile.gettempdir())
@@ skipping 128 matching lines @@
   @recipe_api.non_step
   def __contains__(self, pathname):
     return bool(self.c.dynamic_paths.get(pathname))
 
   @recipe_api.non_step
   def __setitem__(self, pathname, path):
     assert isinstance(path, recipe_config_types.Path), (
       'Setting dynamic path to something other than a Path: %r' % path)
     assert pathname in self.c.dynamic_paths, (
       'Must declare dynamic path (%r) in config before setting it.' % path)
-    assert path.base in self.c.base_paths, (
-      'Dynamic path values must be based on a base_path.')
+    assert isinstance(path.base, recipe_config_types.BasePath), (
+      'Dynamic path values must be based on a base_path' % path.base)
     self.c.dynamic_paths[pathname] = path
 
   @recipe_api.non_step
   def __getitem__(self, name):
     if name in self.c.dynamic_paths:
       r = self.c.dynamic_paths[name]
       assert r is not None, ('Tried to get dynamic path %s but it has not been '
                              'set yet.' % name)
       return r
     if name in self.c.base_paths:
-      return recipe_config_types.Path(name, _bypass=True)
+      return recipe_config_types.Path(recipe_config_types.NamedBasePath(name))
 
   @recipe_api.non_step
   def __getattr__(self, name):
     # retrieve os.path attributes
     if name in self.OK_ATTRS:
       return getattr(self._path_mod, name)
     if name in self.FILTER_METHODS:
       return string_filter(getattr(self._path_mod, name))
     raise AttributeError("'%s' object has no attribute '%s'" %
                          (self._path_mod, name))  # pragma: no cover
 
   @recipe_api.non_step
   def __dir__(self):  # pragma: no cover
     # Used for helping out show_me_the_modules.py
     return self.__dict__.keys() + list(self.OK_ATTRS + self.FILTER_METHODS)