14853: Adds os.name check for subprocess conditional import

Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti <eric.biagiotti@gmail.com>

diff --git a/sdk/cwl/arvados_cwl/runner.py b/sdk/cwl/arvados_cwl/runner.py
index c3015753be4ef8bf19087ee251cf74c18783ee9e..c0d165aa9eed4e5cbaeaf9d365a302957a3921b1 100644 (file)
--- a/sdk/cwl/arvados_cwl/runner.py
+++ b/sdk/cwl/arvados_cwl/runner.py
@@ -13,13 +13,13 @@ from functools import partial
 import logging
 import json
 from collections import namedtuple
-if sys.version_info[0] < 3:
+from io import StringIO
+
+if os.name == "posix" and sys.version_info[0] < 3:
     import subprocess32 as subprocess
 else:
     import subprocess
 
-from io import StringIO
-
 from schema_salad.sourceline import SourceLine, cmap
 
 from cwltool.command_line_tool import CommandLineTool

diff --git a/sdk/python/arvados/commands/keepdocker.py b/sdk/python/arvados/commands/keepdocker.py
index 062545bebe1b107d1e0adb4db33973caede95715..ac387a6f6c7a29ea56e143279f20aca5c166947f 100644 (file)
--- a/sdk/python/arvados/commands/keepdocker.py
+++ b/sdk/python/arvados/commands/keepdocker.py
@@ -16,14 +16,14 @@ import tempfile
 import shutil
 import _strptime
 import fcntl
-if sys.version_info[0] < 3:
+from operator import itemgetter
+from stat import *
+
+if os.name == "posix" and sys.version_info[0] < 3:
     import subprocess32 as subprocess
 else:
     import subprocess
 
-from operator import itemgetter
-from stat import *
-
 import arvados
 import arvados.util
 import arvados.commands._util as arv_cmd