diff options
| author |   Paul Varner <fuzzyray@gentoo.org> | 2016-06-30 18:09:52 -0500 |
|---|---|---|
| committer | Paul Varner <fuzzyray@gentoo.org> | 2016-06-30 18:30:54 -0500 |
| commit | 51f3cf18de49ca9dffc34053da53e62930be9fab (patch) | |
| tree | 2357f76caec95597a9955d88526c262c29835b9d /pym/gentoolkit/deprecated | |
| parent | equery: Change option --ignore-linguas to --ignore-l10n (diff) | |
| download | gentoolkit-51f3cf18de49ca9dffc34053da53e62930be9fab.tar.gz gentoolkit-51f3cf18de49ca9dffc34053da53e62930be9fab.tar.bz2 gentoolkit-51f3cf18de49ca9dffc34053da53e62930be9fab.zip | |
Change open function to use UTF-8 encoding for content.
Uses io.open for Python 2 and built-in open for Python 3
All data from files is treated as Unicode and this should fix
most UnicodeDecodeErrors.
Diffstat (limited to 'pym/gentoolkit/deprecated')
| -rw-r--r-- | pym/gentoolkit/deprecated/helpers.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pym/gentoolkit/deprecated/helpers.py b/pym/gentoolkit/deprecated/helpers.py index 81fa45c..bb0fb7e 100644 --- a/pym/gentoolkit/deprecated/helpers.py +++ b/pym/gentoolkit/deprecated/helpers.py @@ -11,6 +11,10 @@ from __future__ import print_function import warnings +import sys +if sys.hexversion < 0x3000000: + from io import open + import portage from portage import _encodings, _unicode_decode, _unicode_encode from gentoolkit import * @@ -101,7 +105,7 @@ def find_world_packages(prefilter=None): """Returns a tuple of lists, first list is resolved world packages, seond is unresolved package names.""" f = open(_unicode_encode(portage.root+portage.WORLD_FILE, - encoding=_encodings['fs'])) + encoding=_encodings['fs']), encoding=_encodings['content']) pkglist = f.readlines() resolved = [] unresolved = [] |