diff options
author | Zac Medico <zmedico@gentoo.org> | 2012-01-11 17:34:49 -0800 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2012-01-11 17:34:49 -0800 |
commit | 31b4d0cb3a183e29fe0d745187470ded37ffd433 (patch) | |
tree | 0ecc577a6cab0d1193c35e45b183a0b4a9bc55a1 | |
parent | 0dd5593f6754f92657c8c7331f66f812d10eeb44 (diff) | |
download | portage-31b4d0cb3a183e29fe0d745187470ded37ffd433.tar.gz portage-31b4d0cb3a183e29fe0d745187470ded37ffd433.tar.bz2 portage-31b4d0cb3a183e29fe0d745187470ded37ffd433.zip |
read_corresponding_eapi_file: unicode, bug 398587
-rw-r--r-- | 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 58501dca6..13aa721ac 100644 --- a/pym/portage/util/__init__.py +++ b/pym/portage/util/__init__.py @@ -388,7 +388,9 @@ def read_corresponding_eapi_file(filename): default = "0" eapi_file = os.path.join(os.path.dirname(filename), "eapi") try: - f = open(eapi_file, "r") + f = io.open(_unicode_encode(eapi_file, + encoding=_encodings['fs'], errors='strict'), + mode='r', encoding=_encodings['repo.content'], errors='replace') lines = f.readlines() if len(lines) == 1: eapi = lines[0].rstrip("\n") |