diff options
Diffstat (limited to 'pym/_emerge')
-rw-r--r-- | pym/_emerge/BinpkgFetcher.py | 7 | ||||
-rw-r--r-- | pym/_emerge/JobStatusDisplay.py | 6 | ||||
-rw-r--r-- | pym/_emerge/actions.py | 15 | ||||
-rw-r--r-- | pym/_emerge/main.py | 8 |
4 files changed, 21 insertions, 15 deletions
diff --git a/pym/_emerge/BinpkgFetcher.py b/pym/_emerge/BinpkgFetcher.py index e72799a1d..1f244cb1a 100644 --- a/pym/_emerge/BinpkgFetcher.py +++ b/pym/_emerge/BinpkgFetcher.py @@ -3,7 +3,10 @@ # $Id$ from _emerge.SpawnProcess import SpawnProcess -import urlparse +try: + from urllib.parse import urlparse as urllib_parse_urlparse +except ImportError: + from urlparse import urlparse as urllib_parse_urlparse import sys import portage from portage import os @@ -61,7 +64,7 @@ class BinpkgFetcher(SpawnProcess): self.wait() return - protocol = urlparse.urlparse(uri)[0] + protocol = urllib_parse_urlparse(uri)[0] fcmd_prefix = "FETCHCOMMAND" if resume: fcmd_prefix = "RESUMECOMMAND" diff --git a/pym/_emerge/JobStatusDisplay.py b/pym/_emerge/JobStatusDisplay.py index 98724e8a7..dd72a2971 100644 --- a/pym/_emerge/JobStatusDisplay.py +++ b/pym/_emerge/JobStatusDisplay.py @@ -5,11 +5,7 @@ import formatter import sys import time - -try: - from cStringIO import StringIO -except ImportError: - from StringIO import StringIO +from io import StringIO import portage from portage import os diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index 08f11836e..fda9f3d81 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -2,7 +2,10 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -import commands +try: + from subprocess import getstatusoutput as subprocess_getstatusoutput +except ImportError: + from commands import getstatusoutput as subprocess_getstatusoutput import errno import logging import platform @@ -1240,7 +1243,7 @@ def action_info(settings, trees, myopts, myfiles): else: print("Unknown") - output=commands.getstatusoutput("distcc --version") + output=subprocess_getstatusoutput("distcc --version") if not output[0]: print(str(output[1].split("\n",1)[0]), end=' ') if "distcc" in settings.features: @@ -1248,7 +1251,7 @@ def action_info(settings, trees, myopts, myfiles): else: print("[disabled]") - output=commands.getstatusoutput("ccache -V") + output=subprocess_getstatusoutput("ccache -V") if not output[0]: print(str(output[1].split("\n",1)[0]), end=' ') if "ccache" in settings.features: @@ -2661,16 +2664,16 @@ def getgccversion(chost): "!!! other terminals also.\n" ) - mystatus, myoutput = commands.getstatusoutput("gcc-config -c") + mystatus, myoutput = subprocess_getstatusoutput("gcc-config -c") if mystatus == os.EX_OK and myoutput.startswith(chost + "-"): return myoutput.replace(chost + "-", gcc_ver_prefix, 1) - mystatus, myoutput = commands.getstatusoutput( + mystatus, myoutput = subprocess_getstatusoutput( chost + "-" + gcc_ver_command) if mystatus == os.EX_OK: return gcc_ver_prefix + myoutput - mystatus, myoutput = commands.getstatusoutput(gcc_ver_command) + mystatus, myoutput = subprocess_getstatusoutput(gcc_ver_command) if mystatus == os.EX_OK: return gcc_ver_prefix + myoutput diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py index cf3a4e416..950314662 100644 --- a/pym/_emerge/main.py +++ b/pym/_emerge/main.py @@ -7,12 +7,16 @@ import signal import sys import textwrap import platform +try: + from subprocess import getstatusoutput as subprocess_getstatusoutput +except ImportError: + from commands import getstatusoutput as subprocess_getstatusoutput import portage from portage import os from portage import _encodings from portage import _unicode_decode import _emerge.help -import portage.xpak, commands, errno, re, time +import portage.xpak, errno, re, time from portage.output import colorize, xtermTitle, xtermTitleReset from portage.output import create_color_func good = create_color_func("GOOD") @@ -142,7 +146,7 @@ def chk_updated_info_files(root, infodirs, prev_mtimes, retval): raise del e processed_count += 1 - myso=commands.getstatusoutput("LANG=C LANGUAGE=C /usr/bin/install-info --dir-file="+inforoot+"/dir "+inforoot+"/"+x)[1] + myso=subprocess_getstatusoutput("LANG=C LANGUAGE=C /usr/bin/install-info --dir-file="+inforoot+"/dir "+inforoot+"/"+x)[1] existsstr="already exists, for file `" if myso!="": if re.search(existsstr,myso): |