diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-08-21 04:46:31 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-08-21 04:46:31 +0000 |
| commit | 82f0c8c317c1d51a45589b708e476e7711a21da4 (patch) | |
| tree | ace52bce4969f515901ca4fbde735071e3c28221 /pym/portage/env | |
| parent | 9078941af78c0fc7b885ad2779a4f8b73b3f1bd4 (diff) | |
| download | portage-82f0c8c317c1d51a45589b708e476e7711a21da4.tar.gz portage-82f0c8c317c1d51a45589b708e476e7711a21da4.tar.bz2 portage-82f0c8c317c1d51a45589b708e476e7711a21da4.zip | |
Replace _content_encoding, _fs_encoding, and _merge_encoding with direct
usage of _encodings.
svn path=/main/trunk/; revision=14113
Diffstat (limited to 'pym/portage/env')
| -rw-r--r-- | pym/portage/env/loaders.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pym/portage/env/loaders.py b/pym/portage/env/loaders.py index e878ba449..5ec3a066f 100644 --- a/pym/portage/env/loaders.py +++ b/pym/portage/env/loaders.py @@ -7,8 +7,7 @@ import codecs import errno import stat from portage import os -from portage import _content_encoding -from portage import _fs_encoding +from portage import _encodings from portage import _unicode_decode from portage import _unicode_encode from portage.localization import _ @@ -57,7 +56,7 @@ def RecursiveFileLoader(filename): for f in files: try: f = _unicode_decode(f, - encoding=_fs_encoding, errors='strict') + encoding=_encodings['fs'], errors='strict') except UnicodeDecodeError: continue if f[:1] == '.' or f[-1:] == '~': @@ -152,8 +151,8 @@ class FileLoader(DataLoader): for fn in RecursiveFileLoader(self.fname): try: f = codecs.open(_unicode_encode(fn, - encoding=_fs_encoding, errors='strict'), mode='r', - encoding=_content_encoding, errors='replace') + encoding=_encodings['fs'], errors='strict'), mode='r', + encoding=_encodings['content'], errors='replace') except EnvironmentError, e: if e.errno not in (errno.ENOENT, errno.ESTALE): raise |