13306: Updated use of built in 'sorted' and a test_util bytestring

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

diff --git a/sdk/cwl/arvados_cwl/arvcontainer.py b/sdk/cwl/arvados_cwl/arvcontainer.py
index 191ee8bb8ea323862d42f4c9c1cef8a105ed4f96..47fbfa5a7910c56e1d427f150d8410a08b23dddd 100644 (file)
--- a/sdk/cwl/arvados_cwl/arvcontainer.py
+++ b/sdk/cwl/arvados_cwl/arvcontainer.py
@@ -140,7 +140,7 @@ class ArvadosContainer(JobBase):
                 generatemapper = NoFollowPathMapper(self.generatefiles["listing"], "", "",
                                                     separateDirs=False)
 
-                sorteditems = sorted(list(generatemapper.items()), None, key=lambda n: n[1].target)
+                sorteditems = sorted(list(generatemapper.items()), key=lambda n: n[1].target)
 
                 logger.debug("generatemapper is %s", sorteditems)
 

diff --git a/sdk/cwl/tests/test_util.py b/sdk/cwl/tests/test_util.py
index 2532bd596c0f3dfac3554d3b5fe31ffb9d7e50d4..0166a1c25f7ad5ab9a7dbcbe12dd81c168f3f8fe 100644 (file)
--- a/sdk/cwl/tests/test_util.py
+++ b/sdk/cwl/tests/test_util.py
@@ -39,7 +39,7 @@ class TestUtil(unittest.TestCase):
 
     def test_get_current_container_error(self):
         api = mock.MagicMock()
-        api.containers().current().execute.side_effect = ApiError(httplib2.Response({"status": 300}), "")
+        api.containers().current().execute.side_effect = ApiError(httplib2.Response({"status": 300}), b"")
         logger = mock.MagicMock()
 
         self.assertRaises(ApiError, get_current_container(api, num_retries=0, logger=logger))