Lubuntu/ubuntu-dev-tools
3
0
Fork 0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-05-15 02:41:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reimplement ubuntutools.subprocess.Popen as a class instead of a factory function.

Browse Source
This commit is contained in:
Evan Broder 2011-06-19 14:20:47 -07:00
parent d82e65e0e2
commit 5c96b78d72
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ubuntutools/subprocess.py
View File

@ -21,24 +21,25 @@ from subprocess import PIPE, STDOUT, CalledProcessError
__all__ = ['Popen', 'call', 'check_call', 'check_output', 'CalledProcessError', 'PIPE', 'STDOUT'] __all__ = ['Popen', 'call', 'check_call', 'check_output', 'CalledProcessError', 'PIPE', 'STDOUT']
def Popen(*args, **kwargs): class Popen(subprocess.Popen):
kwargs.setdefault('close_fds', True) def __init__(self, *args, **kwargs):
kwargs.setdefault('close_fds', True)
if 'restore_signals' not in inspect.getargspec(subprocess.Popen.__init__)[0]: if 'restore_signals' not in inspect.getargspec(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)
def preexec_fn(): def preexec_fn():
if restore_signals: if restore_signals:
for sig in ('SIGPIPE', 'SIGXFZ', 'SIGXFSZ'): for sig in ('SIGPIPE', 'SIGXFZ', 'SIGXFSZ'):
if hasattr(signal, sig): if hasattr(signal, sig):
signal.signal(getattr(signal, sig), signal.signal(getattr(signal, sig),
signal.SIG_DFL) signal.SIG_DFL)
if given_preexec_fn: if given_preexec_fn:
given_preexec_fn() given_preexec_fn()
kwargs['preexec_fn'] = preexec_fn kwargs['preexec_fn'] = preexec_fn
return subprocess.Popen(*args, **kwargs) subprocess.Popen.__init__(self, *args, **kwargs)
# call, check_call, and check_output are copied directly from the # call, check_call, and check_output are copied directly from the

4
ubuntutools/test/test_pylint.py
View File

@ -28,8 +28,8 @@ WHITELIST = [re.compile(': %s$' % x) for x in (
# mox: # mox:
r"Instance of '.+' has no '(WithSideEffects|MultipleTimes|AndReturn)' " r"Instance of '.+' has no '(WithSideEffects|MultipleTimes|AndReturn)' "
r"member", r"member",
# Wrong Popen # pylint doesn't like *args/**kwargs
r"Function 'Popen' has no '__init__' member", r"Instance of 'Popen' has no '.*' member",
)] )]
class PylintTestCase(unittest.TestCase): class PylintTestCase(unittest.TestCase):