diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-07-12 16:20:45 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-07-12 16:20:45 -0700 |
| commit | 6034b1210e2bda02095a157b55505ea652f67e3c (patch) | |
| tree | 3dccbef1e01e68fce72f76fcd7dd8be38bdc6268 /pym/portage | |
| parent | 3e7b0cbe1ccd875de2052821d91846880c76e6e0 (diff) | |
| download | portage-6034b1210e2bda02095a157b55505ea652f67e3c.tar.gz portage-6034b1210e2bda02095a157b55505ea652f67e3c.tar.bz2 portage-6034b1210e2bda02095a157b55505ea652f67e3c.zip | |
Use portage.subprocess_getstatusoutput() more.
Diffstat (limited to 'pym/portage')
| -rw-r--r-- | pym/portage/checksum.py | 9 | ||||
| -rw-r--r-- | pym/portage/dispatch_conf.py | 6 | ||||
| -rw-r--r-- | pym/portage/output.py | 6 |
3 files changed, 5 insertions, 16 deletions
diff --git a/pym/portage/checksum.py b/pym/portage/checksum.py index eeb5995bb..9e7e455d1 100644 --- a/pym/portage/checksum.py +++ b/pym/portage/checksum.py @@ -1,5 +1,5 @@ # checksum.py -- core Portage functionality -# Copyright 1998-2010 Gentoo Foundation +# Copyright 1998-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 import portage @@ -11,10 +11,6 @@ from portage import _unicode_encode import errno import stat import tempfile -try: - from subprocess import getstatusoutput as subprocess_getstatusoutput -except ImportError: - from commands import getstatusoutput as subprocess_getstatusoutput #dict of all available hash functions hashfunc_map = {} @@ -125,7 +121,8 @@ hashfunc_map["size"] = getsize prelink_capable = False if os.path.exists(PRELINK_BINARY): - results = subprocess_getstatusoutput(PRELINK_BINARY+" --version > /dev/null 2>&1") + results = portage.subprocess_getstatusoutput( + "%s --version > /dev/null 2>&1" % (PRELINK_BINARY,)) if (results[0] >> 8) == 0: prelink_capable=1 del results diff --git a/pym/portage/dispatch_conf.py b/pym/portage/dispatch_conf.py index 228638c01..499102030 100644 --- a/pym/portage/dispatch_conf.py +++ b/pym/portage/dispatch_conf.py @@ -9,10 +9,6 @@ from __future__ import print_function import os, sys, shutil -try: - from subprocess import getstatusoutput as subprocess_getstatusoutput -except ImportError: - from commands import getstatusoutput as subprocess_getstatusoutput import portage from portage.env.loaders import KeyValuePairFileLoader @@ -36,7 +32,7 @@ def diffstatusoutput_len(cmd): UnicodeDecodeError when necessary. """ try: - status, output = subprocess_getstatusoutput(cmd) + status, output = portage.subprocess_getstatusoutput(cmd) return (status, len(output)) except UnicodeDecodeError: return (1, 1) diff --git a/pym/portage/output.py b/pym/portage/output.py index 1bceb0e90..0e8245f9a 100644 --- a/pym/portage/output.py +++ b/pym/portage/output.py @@ -3,10 +3,6 @@ __docformat__ = "epytext" -try: - from subprocess import getstatusoutput as subprocess_getstatusoutput -except ImportError: - from commands import getstatusoutput as subprocess_getstatusoutput import errno import io import formatter @@ -435,7 +431,7 @@ def get_term_size(): pass except ImportError: pass - st, out = subprocess_getstatusoutput('stty size') + st, out = portage.subprocess_getstatusoutput('stty size') if st == os.EX_OK: out = out.split() if len(out) == 2: |