From e351a8cbd4d40999642c93af9762253cb9753c4c Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 12 Jul 2011 10:32:09 -0700 Subject: 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. --- pym/_emerge/BinpkgVerifier.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'pym/_emerge/BinpkgVerifier.py') 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) -- cgit v1.2.3-1-g7c22