Lubuntu/ubuntu-dev-tools
3
0
Fork 0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-05-14 18:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

subprocess: Use getfullargspec on python3

Browse Source
This commit is contained in:
Iain Lane 2017-06-13 10:13:25 +01:00
parent 59582ca06e
commit 798a36c2d8
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ubuntutools/subprocess.py
View File

@ -15,6 +15,7 @@ from __future__ import absolute_import
import inspect import inspect
import signal import signal
import subprocess import subprocess
import sys
from subprocess import PIPE, STDOUT, CalledProcessError from subprocess import PIPE, STDOUT, CalledProcessError
@ -25,8 +26,12 @@ __all__ = ['Popen', 'call', 'check_call', 'check_output', 'CalledProcessError',
class Popen(subprocess.Popen): class Popen(subprocess.Popen):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
kwargs.setdefault('close_fds', True) kwargs.setdefault('close_fds', True)
if sys.version_info[0] >= 3:
getargs = inspect.getfullargspec
else:
getargs = inspect.getargspec
if 'restore_signals' not in inspect.getargspec(subprocess.Popen.__init__)[0]: if 'restore_signals' not in getargs(subprocess.Popen.__init__)[0]:
given_preexec_fn = kwargs.pop('preexec_fn', None) given_preexec_fn = kwargs.pop('preexec_fn', None)
restore_signals = kwargs.pop('restore_signals', True) restore_signals = kwargs.pop('restore_signals', True)