X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/8eb65b21a7b7eea1f987d7fec9cb8ac65de2aeb2..5b3187552676947ee74e4b652e7a04d3d9b9a3a4:/sdk/python/arvados/keep.py diff --git a/sdk/python/arvados/keep.py b/sdk/python/arvados/keep.py index 2846630437..b2700ae5ba 100644 --- a/sdk/python/arvados/keep.py +++ b/sdk/python/arvados/keep.py @@ -76,7 +76,7 @@ class KeepLocator(object): return getattr(self, data_name) def setter(self, hex_str): if not arvados.util.is_hex(hex_str, length): - raise ValueError("{} must be a {}-digit hex string: {}". + raise ValueError("{} is not a {}-digit hex string: {}". format(name, length, hex_str)) setattr(self, data_name, hex_str) return property(getter, setter) @@ -648,10 +648,7 @@ class KeepClient(object): 'uuid': 'proxy', '_service_root': proxy, }] - self._writable_services = [{ - 'uuid': 'proxy', - '_service_root': proxy, - }] + self._writable_services = self._keep_services self.using_proxy = True self._static_services_list = True else: @@ -759,7 +756,7 @@ class KeepClient(object): # for this locator, and return their service_roots (base URIs) # in that order. use_services = self._keep_services - if (need_writable == True): + if need_writable: use_services = self._writable_services sorted_roots.extend([ svc['_service_root'] for svc in sorted( @@ -932,7 +929,7 @@ class KeepClient(object): if isinstance(data, unicode): data = data.encode("ascii") elif not isinstance(data, str): - raise arvados.errors.ArgumentError("Argument 'data' to KeepClient.put must be type 'str'") + raise arvados.errors.ArgumentError("Argument 'data' to KeepClient.put is not type 'str'") data_hash = hashlib.md5(data).hexdigest() if copies < 1: