aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-07-12 16:20:45 -0700
committerZac Medico <zmedico@gentoo.org>2011-07-12 16:20:45 -0700
commit6034b1210e2bda02095a157b55505ea652f67e3c (patch)
tree3dccbef1e01e68fce72f76fcd7dd8be38bdc6268 /pym/portage/dispatch_conf.py
parentAvoid baseline subprocess import under python2. (diff)
downloadportage-6034b1210e2bda02095a157b55505ea652f67e3c.tar.gz
portage-6034b1210e2bda02095a157b55505ea652f67e3c.tar.bz2
portage-6034b1210e2bda02095a157b55505ea652f67e3c.zip
Use portage.subprocess_getstatusoutput() more.
Diffstat (limited to 'pym/portage/dispatch_conf.py')
-rw-r--r--pym/portage/dispatch_conf.py6
1 files changed, 1 insertions, 5 deletions
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)