projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
16434: the python3-arvados-cwl-runner packages on Debian 10 and Ubuntu
[arvados.git]
/
sdk
/
cwl
/
arvados_cwl
/
http.py
diff --git
a/sdk/cwl/arvados_cwl/http.py
b/sdk/cwl/arvados_cwl/http.py
index 59c646ccd3231a7468b90a65731aeedced13ae84..47a304372c58a27ecde8d8c13bb55d6435f9cf79 100644
(file)
--- a/
sdk/cwl/arvados_cwl/http.py
+++ b/
sdk/cwl/arvados_cwl/http.py
@@
-5,7
+5,6
@@
from __future__ import division
from future import standard_library
standard_library.install_aliases()
from __future__ import division
from future import standard_library
standard_library.install_aliases()
-from past.utils import old_div
import requests
import email.utils
import requests
import email.utils
@@
-133,20
+132,20
@@
def http_to_keep(api, project_uuid, url, utcnow=datetime.datetime.utcnow):
count = 0
start = time.time()
checkpoint = start
count = 0
start = time.time()
checkpoint = start
- with c.open(name, "w") as f:
+ with c.open(name, "w
b
") as f:
for chunk in req.iter_content(chunk_size=1024):
count += len(chunk)
f.write(chunk)
loopnow = time.time()
if (loopnow - checkpoint) > 20:
for chunk in req.iter_content(chunk_size=1024):
count += len(chunk)
f.write(chunk)
loopnow = time.time()
if (loopnow - checkpoint) > 20:
- bps =
(old_div(float(count),float(loopnow - start))
)
+ bps =
count / (loopnow - start
)
if cl is not None:
logger.info("%2.1f%% complete, %3.2f MiB/s, %1.0f seconds left",
if cl is not None:
logger.info("%2.1f%% complete, %3.2f MiB/s, %1.0f seconds left",
-
old_div(float(count * 100), float(cl)
),
-
old_div(bps,
(1024*1024)),
-
old_div((cl-count),
bps))
+
((count * 100) / cl
),
+
(bps //
(1024*1024)),
+
((cl-count) //
bps))
else:
else:
- logger.info("%d downloaded, %3.2f MiB/s", count,
old_div(bps,
(1024*1024)))
+ logger.info("%d downloaded, %3.2f MiB/s", count,
(bps /
(1024*1024)))
checkpoint = loopnow
c.save_new(name="Downloaded from %s" % url, owner_uuid=project_uuid, ensure_unique_name=True)
checkpoint = loopnow
c.save_new(name="Downloaded from %s" % url, owner_uuid=project_uuid, ensure_unique_name=True)