projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
21356: Remove all Python 2/3 compatibility imports
[arvados.git]
/
sdk
/
cwl
/
tests
/
test_container.py
diff --git
a/sdk/cwl/tests/test_container.py
b/sdk/cwl/tests/test_container.py
index b95b8eb67bbc4d83b357fcb209bccaf6ebf7dca4..885ee165b0ab248ae20f5b1bfdf84577ad335af0 100644
(file)
--- a/
sdk/cwl/tests/test_container.py
+++ b/
sdk/cwl/tests/test_container.py
@@
-2,9
+2,6
@@
#
# SPDX-License-Identifier: Apache-2.0
#
# SPDX-License-Identifier: Apache-2.0
-from builtins import str
-from builtins import object
-
import arvados_cwl
import arvados_cwl.context
import arvados_cwl.util
import arvados_cwl
import arvados_cwl.context
import arvados_cwl.util
@@
-12,7
+9,6
@@
import arvados_cwl.util
import copy
import arvados.config
import logging
import copy
import arvados.config
import logging
-import mock
import unittest
import os
import functools
import unittest
import os
import functools
@@
-25,6
+21,8
@@
from schema_salad.ref_resolver import Loader
from schema_salad.sourceline import cmap
import io
from schema_salad.sourceline import cmap
import io
+from unittest import mock
+
from .matcher import JsonDiffMatcher, StripYAMLComments
from .mock_discovery import get_rootDesc
from .matcher import JsonDiffMatcher, StripYAMLComments
from .mock_discovery import get_rootDesc