diff options
Diffstat (limited to 'morphlib/cachekeycomputer.py')
| -rw-r--r-- | morphlib/cachekeycomputer.py | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/morphlib/cachekeycomputer.py b/morphlib/cachekeycomputer.py index 6ae2b107..e8cbed2c 100644 --- a/morphlib/cachekeycomputer.py +++ b/morphlib/cachekeycomputer.py @@ -91,24 +91,9 @@ class CacheKeyComputer(object): elif kind in ('system', 'stratum'): morphology = artifact.source.morphology le_dict = dict((k,morphology[k]) for k in morphology.keys()) - checksum = hashlib.sha1(self._stringify(le_dict)) + checksum = hashlib.sha1() + self._hash_thing(checksum, le_dict) keys['morphology-sha1'] = checksum.hexdigest() return keys - def _stringify(self, value): - if type(value) in [str, unicode, int]: - return str(value) - elif value is None: - return '' - elif type(value) is list: - return '[' + ','.join(self._stringify(x) for x in value) + ']' - elif type(value) is dict: - keys = value.keys() - keys.sort(key=lambda s: [ord(c) for c in s]) - pairs = ['%s:%s' % (self._stringify(k), self._stringify(value[k])) - for k in keys] - return '{' + ','.join(pairs) + '}' - else: # pragma: no cover - raise NotImplementedError( - 'type %s is not stringified' % type(value)) |