Skip to content

Use subprocess32 on python 2.7 #6576

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jul 12, 2016
Merged

Use subprocess32 on python 2.7 #6576

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2f94956
Depend on subprocess32 on posix systems for python27
jenshnielsen Jun 12, 2016
67d26aa
Remove no longer needed workaround for subprocess pre 2.7
jenshnielsen Jun 12, 2016
5accdc9
No longer relevant comment
jenshnielsen Jun 12, 2016
4b36ce4
Fix comments
jenshnielsen Jul 10, 2016
c4d126f
compat/subprocess is now pep8 complient
jenshnielsen Jul 12, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove no longer needed workaround for subprocess pre 2.7
  • Loading branch information
@jenshnielsen
jenshnielsen committed Jul 11, 2016
commit 67d26aa3bca4acc88ea57927f72df82964b8ef2f
47 changes: 5 additions & 42 deletions lib/matplotlib/compat/subprocess.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,61 +31,24 @@
__all__ = ['Popen', 'PIPE', 'STDOUT', 'check_output', 'CalledProcessError']



Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Extra newline.

if hasattr(subprocess, 'Popen'):
Popen = subprocess.Popen
# Assume that it also has the other constants.
PIPE = subprocess.PIPE
STDOUT = subprocess.STDOUT
CalledProcessError = subprocess.CalledProcessError
check_output = subprocess.check_output
else:
# In restricted environments (such as Google App Engine), these are
# non-existent. Replace them with dummy versions that always raise OSError.
def Popen(*args, **kwargs):
raise OSError("subprocess.Popen is not supported")

def check_output(*args, **kwargs):
raise OSError("subprocess.check_output is not supported")
PIPE = -1
STDOUT = -2
# There is no need to catch CalledProcessError. These stubs cannot raise
# it. None in an except clause will simply not match any exceptions.
CalledProcessError = None


def _check_output(*popenargs, **kwargs):
r"""Run command with arguments and return its output as a byte
string.

If the exit code was non-zero it raises a CalledProcessError. The
CalledProcessError object will have the return code in the
returncode
attribute and output in the output attribute.

The arguments are the same as for the Popen constructor. Example::

>>> check_output(["ls", "-l", "/dev/null"])
'crw-rw-rw- 1 root root 1, 3 Oct 18 2007 /dev/null\n'

The stdout argument is not allowed as it is used internally.
To capture standard error in the result, use stderr=STDOUT.::

>>> check_output(["/bin/sh", "-c",
... "ls -l non_existent_file ; exit 0"],
... stderr=STDOUT)
'ls: non_existent_file: No such file or directory\n'
"""
if 'stdout' in kwargs:
raise ValueError('stdout argument not allowed, it will be overridden.')
process = Popen(stdout=PIPE, *popenargs, **kwargs)
output, unused_err = process.communicate()
retcode = process.poll()
if retcode:
cmd = kwargs.get("args")
if cmd is None:
cmd = popenargs[0]
raise subprocess.CalledProcessError(retcode, cmd, output=output)
return output


# python2.7's subprocess provides a check_output method
if hasattr(subprocess, 'check_output'):
check_output = subprocess.check_output
else:
check_output = _check_output