Some changes to allow recipes and modules to live noncentrally

scripts/slave/recipe_config_types.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 abc
 import re
 
 from collections import namedtuple
 
 from infra.libs import infra_types
 
+
+RECIPE_MODULE_PREFIX = '\1RECIPE_MODULES'

[iannucci, 2015/05/05 23:35:59]

\1? wat?

Maybe just don't put it in sys.modules?

[luqui, 2015/05/06 22:18:39]

Done.

+
+
 def ResetTostringFns():
   RecipeConfigType._TOSTRING_MAP.clear()  # pylint: disable=W0212
 
 
 def json_fixup(obj):
   if isinstance(obj, RecipeConfigType):
     return str(obj)
   thawed = infra_types.thaw(obj)
   if thawed is not obj:  # i.e. it was a frozen type
     return thawed
@@ skipping 55 matching lines @@
   def parse(base):
     base_match = NamedBasePath.BASE_RE.match(base)
     assert base_match, 'Base should be [ALL_CAPS], got %r' % base
     return NamedBasePath(base_match.group(1).lower())
 
   def __repr__(self):
     return '[%s]' % self.name.upper()
 
 
 class ModuleBasePath(BasePath, namedtuple('ModuleBasePath', 'module')):
-  # All recipe modules are in a magic RECIPE_MODULES package.  Remove it
-  # before rendering MODULE[_] form.
-  MODULE_PREFIX_RE = r'^RECIPE_MODULES\.'
-
   def __repr__(self):
-    name = re.sub(self.MODULE_PREFIX_RE, '', self.module.__name__)
+    prefix = '%s.' % RECIPE_MODULE_PREFIX
+    assert self.module.__name__.startswith(prefix)
+    name = self.module.__name__[len(prefix):]
     return 'RECIPE_MODULE[%s]' % name
 
 
 class Path(RecipeConfigType):
   """Represents a path which is relative to a semantically-named base.
 
   Because there's a lot of platform (separator style) and runtime-specific
   context (working directory) which goes into assembling a final OS-specific
   absolute path, we only store three context-free attributes in this Path
   object.
@@ skipping 50 matching lines @@
     return child.pieces[:len(self.pieces)] == self.pieces
 
   def default_tostring_fn(self):
     suffix = ''
     if self.platform_ext:
       suffix = ', platform_ext=%r' % (self.platform_ext,)
     pieces = ''
     if self.pieces:
       pieces = ', ' + (', '.join(map(repr, self.pieces)))
     return 'Path(\'%s\'%s%s)' % (self.base, pieces, suffix)