X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/ee434dea5db0b02fe762ff80b2270cf268e84378..04efddf61ee4a0e5c65a72a538fe3f026ae94e8e:/sdk/python/arvados/collection.py diff --git a/sdk/python/arvados/collection.py b/sdk/python/arvados/collection.py index 5008450ede..77312e4d49 100644 --- a/sdk/python/arvados/collection.py +++ b/sdk/python/arvados/collection.py @@ -360,7 +360,7 @@ class CollectionWriter(CollectionBase): def portable_data_hash(self): stripped = self.stripped_manifest().encode() - return hashlib.md5(stripped).hexdigest() + '+' + str(len(stripped)) + return '{}+{}'.format(hashlib.md5(stripped).hexdigest(), len(stripped)) def manifest_text(self): self.finish_current_stream() @@ -725,7 +725,7 @@ class RichCollectionBase(CollectionBase): @synchronized def keys(self): """Get a list of names of files and collections directly contained in this collection.""" - return viewkeys(self._items) + return self._items.keys() @synchronized def values(self): @@ -1085,7 +1085,7 @@ class RichCollectionBase(CollectionBase): return self._portable_data_hash else: stripped = self.portable_manifest_text().encode() - return hashlib.md5(stripped).hexdigest() + '+' + str(len(stripped)) + return '{}+{}'.format(hashlib.md5(stripped).hexdigest(), len(stripped)) @synchronized def subscribe(self, callback):