| Index: scripts/tools/show_me_the_modules.py
|
| diff --git a/scripts/tools/show_me_the_modules.py b/scripts/tools/show_me_the_modules.py
|
| index 5412d6633527a483e5ac651dd66f99c16ed1b281..05319d9068cb66793a070cd7398b4887b68ab383 100755
|
| --- a/scripts/tools/show_me_the_modules.py
|
| +++ b/scripts/tools/show_me_the_modules.py
|
| @@ -14,11 +14,14 @@ sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
|
| sys.path.append(os.path.join(os.path.dirname(__file__),
|
| '..', '..', 'third_party'))
|
|
|
| +from recipe_engine import loader
|
| from recipe_engine import main as recipe_main
|
| +from recipe_engine import package
|
| from recipe_engine import recipe_api
|
| -from recipe_engine import loader
|
|
|
| -from slave import recipe_universe
|
| +PACKAGE_PYL = os.path.join(
|
| + os.path.dirname(os.path.dirname(os.path.abspath(__file__))),
|
| + 'slave', 'recipe_package.pyl')
|
|
|
| def trim_doc(docstring):
|
| """From PEP 257"""
|
| @@ -86,11 +89,12 @@ def main():
|
| for method in sorted(common_methods):
|
| pmethod(1, method, getattr(recipe_api.RecipeApi, method))
|
|
|
| - universe = recipe_universe.get_universe()
|
| - deps = universe.deps_from_paths(
|
| - { modpath: modpath
|
| - for modpath in universe.loop_over_recipe_modules() },
|
| - base_path=None)
|
| + universe = loader.RecipeUniverse(package.PackageDeps.create(PACKAGE_PYL))
|
| + deps = universe.deps_from_spec(
|
| + # TODO(luqui): This doesn't handle name scoping correctly (e.g. same-named
|
| + # modules in different packages).
|
| + { modpath: modpath.split('/')[-1]
|
| + for modpath in universe.loop_over_recipe_modules() })
|
|
|
| inst = loader.create_recipe_api(
|
| deps, recipe_main.SequentialRecipeEngine(None, {}, None))
|
|
|