diff options
Diffstat (limited to 'pym/_emerge')
| -rw-r--r-- | pym/_emerge/AbstractEbuildProcess.py | 5 | ||||
| -rw-r--r-- | pym/_emerge/BinpkgVerifier.py | 3 | ||||
| -rw-r--r-- | pym/_emerge/EbuildFetcher.py | 2 | ||||
| -rw-r--r-- | pym/_emerge/EbuildPhase.py | 10 | ||||
| -rw-r--r-- | pym/_emerge/JobStatusDisplay.py | 8 | ||||
| -rw-r--r-- | pym/_emerge/Scheduler.py | 1 |
6 files changed, 14 insertions, 15 deletions
diff --git a/pym/_emerge/AbstractEbuildProcess.py b/pym/_emerge/AbstractEbuildProcess.py index 0d1d991d4..49b85eba3 100644 --- a/pym/_emerge/AbstractEbuildProcess.py +++ b/pym/_emerge/AbstractEbuildProcess.py @@ -1,7 +1,7 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -import platform +import io import stat import textwrap from _emerge.SpawnProcess import SpawnProcess @@ -13,7 +13,6 @@ from portage.localization import _ from portage.package.ebuild._ipc.ExitCommand import ExitCommand from portage.package.ebuild._ipc.QueryCommand import QueryCommand from portage import os -from portage import StringIO from portage import _encodings from portage import _unicode_decode from portage.util._pty import _create_pty_or_pipe @@ -216,7 +215,7 @@ class AbstractEbuildProcess(SpawnProcess): self._elog('eerror', lines) def _elog(self, elog_funcname, lines): - out = StringIO() + out = io.StringIO() phase = self.phase elog_func = getattr(elog_messages, elog_funcname) global_havecolor = portage.output.havecolor diff --git a/pym/_emerge/BinpkgVerifier.py b/pym/_emerge/BinpkgVerifier.py index 379c862af..91dc8a7d3 100644 --- a/pym/_emerge/BinpkgVerifier.py +++ b/pym/_emerge/BinpkgVerifier.py @@ -3,6 +3,7 @@ from _emerge.AsynchronousTask import AsynchronousTask from portage.util import writemsg +import io import sys import portage from portage import os @@ -27,7 +28,7 @@ class BinpkgVerifier(AsynchronousTask): stdout_orig = sys.stdout stderr_orig = sys.stderr global_havecolor = portage.output.havecolor - out = portage.StringIO() + out = io.StringIO() file_exists = True try: sys.stdout = out diff --git a/pym/_emerge/EbuildFetcher.py b/pym/_emerge/EbuildFetcher.py index 51d2f5a10..f67819c16 100644 --- a/pym/_emerge/EbuildFetcher.py +++ b/pym/_emerge/EbuildFetcher.py @@ -186,7 +186,7 @@ class EbuildFetcher(SpawnProcess): return (master_fd, slave_fd) def _eerror(self, lines): - out = portage.StringIO() + out = io.StringIO() for line in lines: eerror(line, phase="unpack", key=self.pkg.cpv, out=out) msg = _unicode_decode(out.getvalue(), diff --git a/pym/_emerge/EbuildPhase.py b/pym/_emerge/EbuildPhase.py index 64d33a8ca..c7f5b8827 100644 --- a/pym/_emerge/EbuildPhase.py +++ b/pym/_emerge/EbuildPhase.py @@ -2,6 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 import gzip +import io import sys import tempfile @@ -23,7 +24,6 @@ portage.proxy.lazyimport.lazyimport(globals(), '_preinst_bsdflags' ) from portage import os -from portage import StringIO from portage import _encodings from portage import _unicode_decode from portage import _unicode_encode @@ -191,7 +191,7 @@ class EbuildPhase(CompositeTask): logfile = self.settings.get("PORTAGE_LOG_FILE") if self.phase == "install": - out = portage.StringIO() + out = io.StringIO() _check_build_log(self.settings, out=out) msg = _unicode_decode(out.getvalue(), encoding=_encodings['content'], errors='replace') @@ -205,7 +205,7 @@ class EbuildPhase(CompositeTask): _post_phase_userpriv_perms(settings) if self.phase == "install": - out = portage.StringIO() + out = io.StringIO() _post_src_install_chost_fix(settings) _post_src_install_uid_fix(settings, out) msg = _unicode_decode(out.getvalue(), @@ -261,7 +261,7 @@ class EbuildPhase(CompositeTask): return if self.phase == "install": - out = portage.StringIO() + out = io.StringIO() _post_src_install_soname_symlinks(self.settings, out) msg = _unicode_decode(out.getvalue(), encoding=_encodings['content'], errors='replace') @@ -333,7 +333,7 @@ class EbuildPhase(CompositeTask): def _elog(self, elog_funcname, lines, background=None): if background is None: background = self.background - out = StringIO() + out = io.StringIO() phase = self.phase elog_func = getattr(elog_messages, elog_funcname) global_havecolor = portage.output.havecolor diff --git a/pym/_emerge/JobStatusDisplay.py b/pym/_emerge/JobStatusDisplay.py index d3d330d30..1949232e7 100644 --- a/pym/_emerge/JobStatusDisplay.py +++ b/pym/_emerge/JobStatusDisplay.py @@ -1,12 +1,12 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 import formatter +import io import sys import time import portage -from portage import StringIO from portage import os from portage import _encodings from portage import _unicode_decode @@ -237,8 +237,8 @@ class JobStatusDisplay(object): failed_str = str(self.failed) load_avg_str = self._load_avg_str() - color_output = StringIO() - plain_output = StringIO() + color_output = io.StringIO() + plain_output = io.StringIO() style_file = portage.output.ConsoleStyleFile(color_output) style_file.write_listener = plain_output style_writer = portage.output.StyleWriter(file=style_file, maxcol=9999) diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py index b88e2c29b..ad276e9bc 100644 --- a/pym/_emerge/Scheduler.py +++ b/pym/_emerge/Scheduler.py @@ -18,7 +18,6 @@ import weakref import zlib import portage -from portage import StringIO from portage import os from portage import _encodings from portage import _unicode_decode, _unicode_encode |