diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-08-14 08:24:25 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-08-14 08:24:25 +0000 |
| commit | ca449003c3f75997ebbc38784056898fdfad5013 (patch) | |
| tree | 4b5f7d2d13ca109bcafe2aae353c8ce7cd12d182 | |
| parent | 96afdded6d5cdcb8b43f5d49907cadd7af181c88 (diff) | |
| download | portage-ca449003c3f75997ebbc38784056898fdfad5013.tar.gz portage-ca449003c3f75997ebbc38784056898fdfad5013.tar.bz2 portage-ca449003c3f75997ebbc38784056898fdfad5013.zip | |
_merge_encoding = sys.getfilesystemencoding()
svn path=/main/trunk/; revision=14028
| -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 = { |