Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(213)

Unified Diff: scripts/slave/recipe_modules/json/api.py

Issue 1151423002: Move recipe engine to third_party/recipe_engine. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Moved field_composer_test with its buddies Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « scripts/slave/recipe_modules/itertools/api.py ('k') | scripts/slave/recipe_modules/json/test_api.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipe_modules/json/api.py
diff --git a/scripts/slave/recipe_modules/json/api.py b/scripts/slave/recipe_modules/json/api.py
index 2b8fc6dc1aea4914031845e2ed2bd805450e02fc..c41bd42e17fb9f05b8fcca8792acb2d9c9b73bd6 100644
--- a/scripts/slave/recipe_modules/json/api.py
+++ b/scripts/slave/recipe_modules/json/api.py
@@ -7,9 +7,9 @@ import collections
import contextlib
import json
-from slave import recipe_api
-from slave import recipe_util
-from slave import recipe_config_types
+from recipe_engine import recipe_api
+from recipe_engine import util as recipe_util
+from recipe_engine import config_types
class JsonOutputPlaceholder(recipe_util.Placeholder):
@@ -68,7 +68,7 @@ class JsonApi(recipe_api.RecipeApi):
@functools.wraps(json.dumps)
def dumps(*args, **kwargs):
kwargs['sort_keys'] = True
- kwargs.setdefault('default', recipe_config_types.json_fixup)
+ kwargs.setdefault('default', config_types.json_fixup)
return json.dumps(*args, **kwargs)
self.dumps = dumps
« no previous file with comments | « scripts/slave/recipe_modules/itertools/api.py ('k') | scripts/slave/recipe_modules/json/test_api.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698