diff options
Diffstat (limited to 'pym/portage/sets/files.py')
| -rw-r--r-- | pym/portage/sets/files.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pym/portage/sets/files.py b/pym/portage/sets/files.py index 035c2dc99..64e36802e 100644 --- a/pym/portage/sets/files.py +++ b/pym/portage/sets/files.py @@ -7,7 +7,7 @@ import re from itertools import chain from portage import os -from portage import _fs_encoding +from portage import _encodings from portage import _unicode_decode from portage import _unicode_encode from portage.util import grabfile, write_atomic, ensure_dirs, normalize_path @@ -131,16 +131,16 @@ class StaticFileSet(EditablePackageSet): try: directory = _unicode_decode(directory, - encoding=_fs_encoding, errors='strict') + encoding=_encodings['fs'], errors='strict') # Now verify that we can also encode it. _unicode_encode(directory, - encoding=_fs_encoding, errors='strict') + encoding=_encodings['fs'], errors='strict') except UnicodeError: directory = _unicode_decode(directory, - encoding=_fs_encoding, errors='replace') + encoding=_encodings['fs'], errors='replace') raise SetConfigError( _("Directory path contains invalid character(s) for encoding '%s': '%s'") \ - % (_fs_encoding, directory)) + % (_encodings['fs'], directory)) if os.path.isdir(directory): directory = normalize_path(directory) @@ -148,7 +148,7 @@ class StaticFileSet(EditablePackageSet): for parent, dirs, files in os.walk(directory): try: parent = _unicode_decode(parent, - encoding=_fs_encoding, errors='strict') + encoding=_encodings['fs'], errors='strict') except UnicodeDecodeError: continue for d in dirs[:]: @@ -157,7 +157,7 @@ class StaticFileSet(EditablePackageSet): for filename in files: try: filename = _unicode_decode(filename, - encoding=_fs_encoding, errors='strict') + encoding=_encodings['fs'], errors='strict') except UnicodeDecodeError: continue if filename[:1] == '.': |