浏览代码

fix: use subprocess32 for python2

Signed-off-by: Nao YONASHIRO <[email protected]>
Nao YONASHIRO 6 年之前
父节点
当前提交
719a1b0581
共有 2 个文件被更改,包括 6 次插入1 次删除
  1. 5 1
      compose/service.py
  2. 1 0
      setup.py

+ 5 - 1
compose/service.py

@@ -6,7 +6,6 @@ import json
 import logging
 import os
 import re
-import subprocess
 import sys
 import tempfile
 from collections import namedtuple
@@ -62,6 +61,11 @@ from .utils import parse_seconds_float
 from .utils import truncate_id
 from .utils import unique_everseen
 
+if six.PY2:
+    import subprocess32 as subprocess
+else:
+    import subprocess
+
 log = logging.getLogger(__name__)
 
 

+ 1 - 0
setup.py

@@ -52,6 +52,7 @@ if sys.version_info[:2] < (3, 4):
     tests_require.append('mock >= 1.0.1, < 4')
 
 extras_require = {
+    ':python_version < "3.2"': ['subprocess32 >= 3.5.4, < 4'],
     ':python_version < "3.4"': ['enum34 >= 1.0.4, < 2'],
     ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5, < 4'],
     ':python_version < "3.3"': ['ipaddress >= 1.0.16, < 2'],