_merge_encoding = sys.getfilesystemencoding()

svn path=/main/trunk/; revision=14028

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 0dd901dbe916dc73e83093df9b9b3e8379ad0cb5..7a1b80f150cd2ea18168065c571c250abdf82ba2 100644 (file)
--- 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 = {