diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-07-12 10:32:09 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-07-12 10:32:09 -0700 |
| commit | e351a8cbd4d40999642c93af9762253cb9753c4c (patch) | |
| tree | 060b5f5f40f022ab0328935a99dd24c63ec9162b /pym/_emerge/AbstractEbuildProcess.py | |
| parent | 5df96179611ce0e98727945b1800b43daccedfc2 (diff) | |
| download | portage-e351a8cbd4d40999642c93af9762253cb9753c4c.tar.gz portage-e351a8cbd4d40999642c93af9762253cb9753c4c.tar.bz2 portage-e351a8cbd4d40999642c93af9762253cb9753c4c.zip | |
Remove unneeded _unicode_decode for io.StringIO.
Since StringIO.StringIO fallback was removed in commit
5df96179611ce0e98727945b1800b43daccedfc2, we can rely on
io.StringIO.getoutput() to return unicode, so there's no
need to call _unicode_decode on the result.
Diffstat (limited to 'pym/_emerge/AbstractEbuildProcess.py')
| -rw-r--r-- | pym/_emerge/AbstractEbuildProcess.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/pym/_emerge/AbstractEbuildProcess.py b/pym/_emerge/AbstractEbuildProcess.py index 49b85eba3..4147ecb7b 100644 --- a/pym/_emerge/AbstractEbuildProcess.py +++ b/pym/_emerge/AbstractEbuildProcess.py @@ -13,8 +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 _encodings -from portage import _unicode_decode from portage.util._pty import _create_pty_or_pipe from portage.util import apply_secpass_permissions @@ -226,8 +224,7 @@ class AbstractEbuildProcess(SpawnProcess): elog_func(line, phase=phase, key=self.settings.mycpv, out=out) finally: portage.output.havecolor = global_havecolor - msg = _unicode_decode(out.getvalue(), - encoding=_encodings['content'], errors='replace') + msg = out.getvalue() if msg: log_path = None if self.settings.get("PORTAGE_BACKGROUND") != "subprocess": |