13306: Removing old_div to simplify division operations

Arvados-DCO-1.1-Signed-off-by:  Eric Biagiotti <ebiagiotti@veritasgenetics.com>

diff --git a/sdk/cwl/arvados_cwl/executor.py b/sdk/cwl/arvados_cwl/executor.py
index c6c2c87136188a34fabc19b3f5aae0a69400bcfb..eab12efaac6e34f08cc7ffc2869ebe344a7ae44b 100644 (file)
--- a/sdk/cwl/arvados_cwl/executor.py
+++ b/sdk/cwl/arvados_cwl/executor.py
@@ -6,7 +6,6 @@ from __future__ import division
 from builtins import next
 from builtins import object
 from future.utils import viewvalues
-from past.utils import old_div
 
 import argparse
 import logging
@@ -620,7 +619,7 @@ http://doc.arvados.org/install/install-api-server.html#disable_api_methods
                         visited.add(m.group(1))
                         estimated_size[0] += int(m.group(2))
             visit_class(job_order, ("File", "Directory"), estimate_collection_cache)
-            runtimeContext.collection_cache_size = max((old_div((estimated_size[0]*192), (1024*1024)))+1, 256)
+            runtimeContext.collection_cache_size = max(((estimated_size[0]*192) // (1024*1024))+1, 256)
             self.collection_cache.set_cap(runtimeContext.collection_cache_size*1024*1024)
 
         logger.info("Using collection cache size %s MiB", runtimeContext.collection_cache_size)

diff --git a/sdk/cwl/arvados_cwl/http.py b/sdk/cwl/arvados_cwl/http.py
index 59c646ccd3231a7468b90a65731aeedced13ae84..ccc2e793b067f4e0853da275947a08d3630723a3 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 past.utils import old_div
 
 import requests
 import email.utils
@@ -139,14 +138,14 @@ def http_to_keep(api, project_uuid, url, utcnow=datetime.datetime.utcnow):
             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)

diff --git a/sdk/cwl/tests/wf/check_mem.py b/sdk/cwl/tests/wf/check_mem.py
index 818cfb778a058fe94590990c2a53d0a94811cb2c..b4322a809320b7be5823296f6cb72a39d4273f24 100644 (file)
--- a/sdk/cwl/tests/wf/check_mem.py
+++ b/sdk/cwl/tests/wf/check_mem.py
@@ -4,7 +4,6 @@
 
 from __future__ import print_function
 from __future__ import division
-from past.utils import old_div
 
 import arvados
 import sys
@@ -13,7 +12,7 @@ import os
 if "JOB_UUID" in os.environ:
     requested = arvados.api().jobs().get(uuid=os.environ["JOB_UUID"]).execute()["runtime_constraints"]["min_ram_mb_per_node"]
 else:
-    requested = old_div(arvados.api().containers().current().execute()["runtime_constraints"]["ram"],(1024*1024))
+    requested = arvados.api().containers().current().execute()["runtime_constraints"]["ram"] // (1024*1024)
 
 print("Requested %d expected %d" % (requested, int(sys.argv[1])))