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

Unified Diff: recipe_engine/config_types.py

Issue 1344583003: Recipe package system. (Closed) Base URL: git@github.com:luci/recipes-py.git@master
Patch Set: Recompiled proto Created 5 years, 3 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 | « recipe_engine/config.py ('k') | recipe_engine/doc.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: recipe_engine/config_types.py
diff --git a/recipe_engine/config_types.py b/recipe_engine/config_types.py
index 5dd216e1fcaed3a0494c83efb62110c980415e84..c0cb52f280c95f8ef9954b85d26847e8ecbbd26e 100644
--- a/recipe_engine/config_types.py
+++ b/recipe_engine/config_types.py
@@ -7,8 +7,7 @@ import re
from collections import namedtuple
-from infra.libs import infra_types
-
+from . import types
RECIPE_MODULE_PREFIX = 'RECIPE_MODULES'
@@ -20,9 +19,8 @@ def ResetTostringFns():
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
+ if isinstance(obj, types.FrozenDict):
+ return dict(obj)
raise TypeError("%r is not JSON serializable" % obj)
« no previous file with comments | « recipe_engine/config.py ('k') | recipe_engine/doc.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698