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 ) id 1Rl9ZO-0005x1-Jv for garchives@archives.gentoo.org; Thu, 12 Jan 2012 01:35:10 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A022D21C074; Thu, 12 Jan 2012 01:35:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 732C121C074 for ; Thu, 12 Jan 2012 01:35:01 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F19291B4033 for ; Thu, 12 Jan 2012 01:35:00 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 68EF680044 for ; Thu, 12 Jan 2012 01:35:00 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <31b4d0cb3a183e29fe0d745187470ded37ffd433.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/util/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/util/__init__.py X-VCS-Directories: pym/portage/util/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 31b4d0cb3a183e29fe0d745187470ded37ffd433 Date: Thu, 12 Jan 2012 01:35:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 256b904d-9cb6-4f22-b275-0e4a62aafc19 X-Archives-Hash: e8fdd01d65608b6df5ee8f91a862ca3f commit: 31b4d0cb3a183e29fe0d745187470ded37ffd433 Author: Zac Medico gentoo org> AuthorDate: Thu Jan 12 01:34:49 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Jan 12 01:34:49 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D31b4d0cb read_corresponding_eapi_file: unicode, bug 398587 --- pym/portage/util/__init__.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/pym/portage/util/__init__.py b/pym/portage/util/__init__.py index 58501dc..13aa721 100644 --- a/pym/portage/util/__init__.py +++ b/pym/portage/util/__init__.py @@ -388,7 +388,9 @@ def read_corresponding_eapi_file(filename): default =3D "0" eapi_file =3D os.path.join(os.path.dirname(filename), "eapi") try: - f =3D open(eapi_file, "r") + f =3D io.open(_unicode_encode(eapi_file, + encoding=3D_encodings['fs'], errors=3D'strict'), + mode=3D'r', encoding=3D_encodings['repo.content'], errors=3D'replace'= ) lines =3D f.readlines() if len(lines) =3D=3D 1: eapi =3D lines[0].rstrip("\n")