diff options
| -rw-r--r-- | pym/portage/__init__.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 0dd901dbe..7a1b80f15 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -196,9 +196,7 @@ class _unicode_module_wrapper(object): result = _unicode_func_wrapper(result, encoding=encoding) return result -# TODO: Change this to sys.getfilesystemencoding() after all of -# the merge code has been updated to use _merge_encoding. -_merge_encoding = 'utf_8' +_merge_encoding = sys.getfilesystemencoding() import os as _os _os_overrides = { |