diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2012-08-02 12:55:09 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-08-02 12:55:09 -0700 |
| commit | 69a95739d34b9112a60774ede71eea1661b78f2d (patch) | |
| tree | 5f5567f9a801e6c3d75317586b478e648d5b63ab /pym | |
| parent | _urlopen: fix python2 http password breakage (diff) | |
| download | portage-69a95739d34b9112a60774ede71eea1661b78f2d.tar.gz portage-69a95739d34b9112a60774ede71eea1661b78f2d.tar.bz2 portage-69a95739d34b9112a60774ede71eea1661b78f2d.zip | |
parse_desktop_entry: fix python3 bug #429544
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage/util/_desktop_entry.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pym/portage/util/_desktop_entry.py b/pym/portage/util/_desktop_entry.py index 790178013..8c760c043 100644 --- a/pym/portage/util/_desktop_entry.py +++ b/pym/portage/util/_desktop_entry.py @@ -31,7 +31,11 @@ def parse_desktop_entry(path): encoding=_encodings['fs'], errors='strict'), mode='r', encoding=_encodings['repo.content'], errors='replace') as f: - read_file(f) + content = f.read() + + # In Python 3.2, read_file does not support bytes in file names + # (see bug #429544), so use StringIO to hide the file name. + read_file(io.StringIO(content)) return parser |