From ca449003c3f75997ebbc38784056898fdfad5013 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 14 Aug 2009 08:24:25 +0000 Subject: _merge_encoding = sys.getfilesystemencoding() svn path=/main/trunk/; revision=14028 --- pym/portage/__init__.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'pym') 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 = { -- cgit v1.2.3-1-g7c22