X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/03f5792d109cca57f9a6dd585461e3622a9c74c5..a169f9fe06c58b459347c1c71d3a4d725dfddb97:/sdk/cwl/arvados_cwl/http.py diff --git a/sdk/cwl/arvados_cwl/http.py b/sdk/cwl/arvados_cwl/http.py index 59c646ccd3..47a304372c 100644 --- 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 past.utils import old_div 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 - with c.open(name, "w") as f: + with c.open(name, "wb") as f: 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", - 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: - 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)