projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '6362-asset-config' refs #6362
[arvados.git]
/
sdk
/
python
/
arvados
/
keep.py
diff --git
a/sdk/python/arvados/keep.py
b/sdk/python/arvados/keep.py
index 28466304372f08c797072b4fed54269fd92751ef..b2700ae5ba71dc9023ce8eb4f843a0d301b729b6 100644
(file)
--- 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):
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)
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,
}]
'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:
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
# 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(
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):
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:
data_hash = hashlib.md5(data).hexdigest()
if copies < 1: