diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-07-12 15:46:54 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-07-12 15:46:54 -0700 |
| commit | 3e7b0cbe1ccd875de2052821d91846880c76e6e0 (patch) | |
| tree | 9be0736fd35deb8e3e397dfbe1fc6b133a506893 | |
| parent | d8d1190a5dcf5301e7965c6d198b06ca0d5fc152 (diff) | |
| download | portage-3e7b0cbe1ccd875de2052821d91846880c76e6e0.tar.gz portage-3e7b0cbe1ccd875de2052821d91846880c76e6e0.tar.bz2 portage-3e7b0cbe1ccd875de2052821d91846880c76e6e0.zip | |
Avoid baseline subprocess import under python2.
| -rw-r--r-- | pym/portage/__init__.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 5411ec921..2a2eb99ad 100644 --- 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 |