diff options
Diffstat (limited to 'lib/bb/cache.py')
| -rw-r--r-- | lib/bb/cache.py | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/lib/bb/cache.py b/lib/bb/cache.py index 393d54174..96abd7141 100644 --- a/lib/bb/cache.py +++ b/lib/bb/cache.py @@ -28,21 +28,15 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - import os +import sys import logging +import pickle from collections import defaultdict import bb.utils logger = logging.getLogger("BitBake.Cache") -try: - import cPickle as pickle -except ImportError: - import pickle - logger.info("Importing cPickle failed. " - "Falling back to a very slow implementation.") - __cache_version__ = "150" def getCacheFile(path, filename, data_hash): @@ -80,7 +74,7 @@ class RecipeInfoCommon(object): out_dict = dict((var, metadata.getVarFlag(var, flag, True)) for var in varlist) if squash: - return dict((k,v) for (k,v) in out_dict.iteritems() if v) + return dict((k,v) for (k,v) in out_dict.items() if v) else: return out_dict @@ -240,7 +234,7 @@ class CoreRecipeInfo(RecipeInfoCommon): cachedata.universe_target.append(self.pn) cachedata.hashfn[fn] = self.hashfilename - for task, taskhash in self.basetaskhashes.iteritems(): + for task, taskhash in self.basetaskhashes.items(): identifier = '%s.%s' % (fn, task) cachedata.basetaskhash[identifier] = taskhash @@ -404,7 +398,7 @@ class Cache(object): infos = [] datastores = cls.load_bbfile(filename, appends, configdata) depends = [] - for variant, data in sorted(datastores.iteritems(), + for variant, data in sorted(datastores.items(), key=lambda i: i[0], reverse=True): virtualfn = cls.realfn2virtual(filename, variant) @@ -616,7 +610,7 @@ class Cache(object): pickler_dict['CoreRecipeInfo'].dump(bb.__version__) try: - for key, info_array in self.depends_cache.iteritems(): + for key, info_array in self.depends_cache.items(): for info in info_array: if isinstance(info, RecipeInfoCommon): cache_class_name = info.__class__.__name__ |