1 |
commit: 3e7b0cbe1ccd875de2052821d91846880c76e6e0 |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jul 12 22:46:54 2011 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jul 12 22:46:54 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=3e7b0cbe |
7 |
|
8 |
Avoid baseline subprocess import under python2. |
9 |
|
10 |
--- |
11 |
pym/portage/__init__.py | 6 ++++-- |
12 |
1 files changed, 4 insertions(+), 2 deletions(-) |
13 |
|
14 |
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py |
15 |
index 5411ec9..2a2eb99 100644 |
16 |
--- a/pym/portage/__init__.py |
17 |
+++ b/pym/portage/__init__.py |
18 |
@@ -17,10 +17,12 @@ try: |
19 |
import re |
20 |
import types |
21 |
|
22 |
+ # Try the commands module first, since this allows us to eliminate |
23 |
+ # the subprocess module from the baseline imports under python2. |
24 |
try: |
25 |
- from subprocess import getstatusoutput as subprocess_getstatusoutput |
26 |
- except ImportError: |
27 |
from commands import getstatusoutput as subprocess_getstatusoutput |
28 |
+ except ImportError: |
29 |
+ from subprocess import getstatusoutput as subprocess_getstatusoutput |
30 |
|
31 |
import platform |