Avoid baseline subprocess import under python2.
authorZac Medico <zmedico@gentoo.org>
Tue, 12 Jul 2011 22:46:54 +0000 (15:46 -0700)
committerZac Medico <zmedico@gentoo.org>
Tue, 12 Jul 2011 22:46:54 +0000 (15:46 -0700)
pym/portage/__init__.py

index 5411ec9216883fa3692cbdc1b8601f3e5f3d0bf4..2a2eb99ade21f3e389ce429c46606e5ef0bf763b 100644 (file)
@@ -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