From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 14 Aug 2009 08:24:25 +0000 (-0000)
Subject: _merge_encoding = sys.getfilesystemencoding()
X-Git-Tag: v2.2_rc39~77
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ca449003c3f75997ebbc38784056898fdfad5013;p=portage.git

_merge_encoding = sys.getfilesystemencoding()

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

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 = {