diff options
Diffstat (limited to 'pym/gentoolkit/revdep_rebuild/collect.py')
| -rw-r--r-- | pym/gentoolkit/revdep_rebuild/collect.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pym/gentoolkit/revdep_rebuild/collect.py b/pym/gentoolkit/revdep_rebuild/collect.py index 1f34f1c..ab3ef97 100644 --- a/pym/gentoolkit/revdep_rebuild/collect.py +++ b/pym/gentoolkit/revdep_rebuild/collect.py @@ -9,6 +9,8 @@ import os import glob import stat import sys +if sys.hexversion < 0x3000000: + from io import open import portage from portage import _encodings, _unicode_decode, _unicode_encode @@ -35,7 +37,8 @@ def parse_conf(conf_file, visited=None, logger=None): for conf in conf_file: try: - with open(_unicode_encode(conf, encoding=_encodings['fs'])) as _file: + with open(_unicode_encode(conf, encoding=_encodings['fs']), + encoding=_encodings['content']) as _file: for line in _file.readlines(): line = line.strip() if line.startswith('#'): @@ -77,7 +80,8 @@ def prepare_search_dirs(logger, settings): #try: with open(_unicode_encode(os.path.join( portage.root, settings['DEFAULT_ENV_FILE']), - encoding=_encodings['fs']), mode='r') as _file: + encoding=_encodings['fs']), mode='r', + encoding=_encodings['content']) as _file: for line in _file.readlines(): line = line.strip() match = re.match("^export (ROOT)?PATH='([^']+)'", line) |