diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-07-12 01:41:09 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-07-12 01:41:09 -0700 |
| commit | 5df96179611ce0e98727945b1800b43daccedfc2 (patch) | |
| tree | e60d86543cf61b8f8fa93858c4068b2305a6769b /pym/_emerge/AbstractEbuildProcess.py | |
| parent | 428053ee44e4a14b3c74dc8e541bcb062b31a799 (diff) | |
| download | portage-5df96179611ce0e98727945b1800b43daccedfc2.tar.gz portage-5df96179611ce0e98727945b1800b43daccedfc2.tar.bz2 portage-5df96179611ce0e98727945b1800b43daccedfc2.zip | |
Remove python-2.6 StringIO.StringIO fallback.
Since the io module in python-2.6 was broken when threading was
disabled, we needed to fall back from io.StringIO to StringIO.StringIO
in this case (typically just for Gentoo's stage1 and stage2 tarballs).
Now that python-2.7 is stable in stages and we rely on io.open() being
available, we can also rely on io.StringIO being available.
Diffstat (limited to 'pym/_emerge/AbstractEbuildProcess.py')
| -rw-r--r-- | pym/_emerge/AbstractEbuildProcess.py | 5 |
1 files changed, 2 insertions, 3 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 |