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/BinpkgVerifier.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/BinpkgVerifier.py')
| -rw-r--r-- | pym/_emerge/BinpkgVerifier.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/pym/_emerge/BinpkgVerifier.py b/pym/_emerge/BinpkgVerifier.py index 91dc8a7d3..0052967f6 100644 --- a/pym/_emerge/BinpkgVerifier.py +++ b/pym/_emerge/BinpkgVerifier.py @@ -7,8 +7,6 @@ import io import sys import portage from portage import os -from portage import _encodings -from portage import _unicode_decode from portage.package.ebuild.fetch import _checksum_failure_temp_file class BinpkgVerifier(AsynchronousTask): @@ -67,8 +65,7 @@ class BinpkgVerifier(AsynchronousTask): sys.stderr = stderr_orig portage.output.havecolor = global_havecolor - msg = _unicode_decode(out.getvalue(), - encoding=_encodings['content'], errors='replace') + msg = out.getvalue() if msg: self.scheduler.output(msg, log_path=self.logfile, background=self.background) |