13501: Replaces subprocess with subprocess32 on keepdocker.

Reverted subprocess32 usage on arvados_version.py files so that package
building scripts don't break.

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima@veritasgenetics.com>

diff --git a/sdk/cwl/arvados_version.py b/sdk/cwl/arvados_version.py
index a0aba0ed2d76aa24d0158f7227bc3995c494618e..88cf1ed7caa1da04fd5a1794c616cd5a0f2039b3 100644 (file)
--- a/sdk/cwl/arvados_version.py
+++ b/sdk/cwl/arvados_version.py
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-import subprocess32 as subprocess
+import subprocess
 import time
 import os
 import re

diff --git a/sdk/python/arvados/__init__.py b/sdk/python/arvados/__init__.py
index bb97f3c1d8186adb0da84f541997157f149c0c1a..c8c70298077092ea8c0b14707e6e6f8563ab2411 100644 (file)
--- a/sdk/python/arvados/__init__.py
+++ b/sdk/python/arvados/__init__.py
@@ -18,9 +18,7 @@ import os
 import pprint
 import re
 import string
-import subprocess
 import sys
-import threading
 import time
 import types
 import zlib

diff --git a/sdk/python/arvados/commands/keepdocker.py b/sdk/python/arvados/commands/keepdocker.py
index fe6beab510915dd85b8b29b0c528fb59d9936569..55fc6b626d5de9798b989d2b252d158ca89baab6 100644 (file)
--- a/sdk/python/arvados/commands/keepdocker.py
+++ b/sdk/python/arvados/commands/keepdocker.py
@@ -10,7 +10,7 @@ import errno
 import json
 import os
 import re
-import subprocess
+import subprocess32 as subprocess
 import sys
 import tarfile
 import tempfile

diff --git a/services/nodemanager/arvados_version.py b/services/nodemanager/arvados_version.py
index e7a4914bf2662a9624f4e5ad4d595c3a2644a5dd..a24d53dad6a629f9d08692bb19dd62e144655a7b 100644 (file)
--- a/services/nodemanager/arvados_version.py
+++ b/services/nodemanager/arvados_version.py
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-import subprocess32 as subprocess
+import subprocess
 import time
 import os
 import re