projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
5305: Add heuristics to choose name when collection is referenced by PDH instead...
[arvados.git]
/
sdk
/
python
/
arvados
/
keep.py
diff --git
a/sdk/python/arvados/keep.py
b/sdk/python/arvados/keep.py
index 262e68864db7a7e12847a138de9922c489f473e2..71dc7ce7af863f60fb9e741b7bbc1231c22b146b 100644
(file)
--- a/
sdk/python/arvados/keep.py
+++ b/
sdk/python/arvados/keep.py
@@
-394,11
+394,11
@@
class KeepClient(object):
replicas_stored = int(result.headers['x-keep-replicas-stored'])
except (KeyError, ValueError):
replicas_stored = 1
replicas_stored = int(result.headers['x-keep-replicas-stored'])
except (KeyError, ValueError):
replicas_stored = 1
- limiter.save_response(result.
tex
t.strip(), replicas_stored)
+ limiter.save_response(result.
conten
t.strip(), replicas_stored)
elif status is not None:
_logger.debug("Request fail: PUT %s => %s %s",
self.args['data_hash'], status,
elif status is not None:
_logger.debug("Request fail: PUT %s => %s %s",
self.args['data_hash'], status,
- self.service.last_result.
tex
t)
+ self.service.last_result.
conten
t)
def __init__(self, api_client=None, proxy=None,
def __init__(self, api_client=None, proxy=None,
@@
-684,6
+684,12
@@
class KeepClient(object):
exponential backoff. The default value is set when the
KeepClient is initialized.
"""
exponential backoff. The default value is set when the
KeepClient is initialized.
"""
+
+ 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'")
+
data_hash = hashlib.md5(data).hexdigest()
if copies < 1:
return data_hash
data_hash = hashlib.md5(data).hexdigest()
if copies < 1:
return data_hash