Recipe package system.

recipe_engine/config_types.py

 # Copyright 2013-2015 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
-
+from . import types
 
 RECIPE_MODULE_PREFIX = 'RECIPE_MODULES'
 
 
 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
+  if isinstance(obj, types.FrozenDict):
+    return dict(obj)
   raise TypeError("%r is not JSON serializable" % obj)
 
 
 class RecipeConfigType(object):
   """Base class for custom Recipe config types, intended to be subclassed.
 
   RecipeConfigTypes are meant to be PURE data. There should be no dependency on
   any external systems (i.e. no importing sys, os, etc.).
 
   The subclasses should override default_tostring_fn. This method should
@@ skipping 119 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)