projects
/
portage.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d8d1190
)
Avoid baseline subprocess import under python2.
author
Zac Medico
<zmedico@gentoo.org>
Tue, 12 Jul 2011 22:46:54 +0000
(15:46 -0700)
committer
Zac Medico
<zmedico@gentoo.org>
Tue, 12 Jul 2011 22:46:54 +0000
(15:46 -0700)
pym/portage/__init__.py
patch
|
blob
|
history
diff --git
a/pym/portage/__init__.py
b/pym/portage/__init__.py
index 5411ec9216883fa3692cbdc1b8601f3e5f3d0bf4..2a2eb99ade21f3e389ce429c46606e5ef0bf763b 100644
(file)
--- a/
pym/portage/__init__.py
+++ b/
pym/portage/__init__.py
@@
-17,10
+17,12
@@
try:
import re
import types
+ # Try the commands module first, since this allows us to eliminate
+ # the subprocess module from the baseline imports under python2.
try:
- from subprocess import getstatusoutput as subprocess_getstatusoutput
- except ImportError:
from commands import getstatusoutput as subprocess_getstatusoutput
+ except ImportError:
+ from subprocess import getstatusoutput as subprocess_getstatusoutput
import platform