From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
	by finch.gentoo.org with esmtp (Exim 4.60)
	(envelope-from <gentoo-commits+bounces-129265-garchives=archives.gentoo.org@lists.gentoo.org>)
	id 1LhHQh-0000p7-OZ
	for garchives@archives.gentoo.org; Wed, 11 Mar 2009 05:56:35 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 4A44AE02CD;
	Wed, 11 Mar 2009 05:56:35 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id 2945AE02CD
	for <gentoo-commits@lists.gentoo.org>; Wed, 11 Mar 2009 05:56:35 +0000 (UTC)
Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133])
	(using TLSv1 with cipher AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTP id BEF07644BB
	for <gentoo-commits@lists.gentoo.org>; Wed, 11 Mar 2009 05:56:34 +0000 (UTC)
Received: from zmedico by stork.gentoo.org with local (Exim 4.69)
	(envelope-from <zmedico@stork.gentoo.org>)
	id 1LhHQg-0001YX-DQ
	for gentoo-commits@lists.gentoo.org; Wed, 11 Mar 2009 05:56:34 +0000
To: gentoo-commits@lists.gentoo.org
From: "Zac Medico (zmedico)" <zmedico@gentoo.org>
Subject: [gentoo-commits] portage r12920 - main/branches/2.1.6/pym/_emerge
X-VCS-Repository: portage
X-VCS-Revision: 12920
X-VCS-Files: main/branches/2.1.6/pym/_emerge/__init__.py
X-VCS-Directories: main/branches/2.1.6/pym/_emerge
X-VCS-Committer: zmedico
X-VCS-Committer-Name: Zac Medico
Content-Type: text/plain; charset=UTF-8
Message-Id: <E1LhHQg-0001YX-DQ@stork.gentoo.org>
Sender: Zac Medico <zmedico@stork.gentoo.org>
Date: Wed, 11 Mar 2009 05:56:34 +0000
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: be00a325-ff62-4399-852f-7dd7331ce418
X-Archives-Hash: 26615f972324d4108907f4a4db1fb3da

Author: zmedico
Date: 2009-03-11 05:56:33 +0000 (Wed, 11 Mar 2009)
New Revision: 12920

Modified:
   main/branches/2.1.6/pym/_emerge/__init__.py
Log:
Decode terminal codes from binary when necessary, for python-3.0 compatib=
ility
since sys.stdout is a text stream. (trunk r12649)

Modified: main/branches/2.1.6/pym/_emerge/__init__.py
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- main/branches/2.1.6/pym/_emerge/__init__.py	2009-03-11 05:56:01 UTC (=
rev 12919)
+++ main/branches/2.1.6/pym/_emerge/__init__.py	2009-03-11 05:56:33 UTC (=
rev 12920)
@@ -9609,6 +9609,9 @@
 			for k, capname in self._termcap_name_map.iteritems():
 				term_codes[k] =3D self._default_term_codes[capname]
 			object.__setattr__(self, "_term_codes", term_codes)
+		for k, v in self._term_codes.items():
+			if not isinstance(v, str):
+				self._term_codes[k] =3D v.decode()
=20
 	def _init_term(self):
 		"""