diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-07-20 23:50:20 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-07-20 23:50:20 +0000 |
| commit | 581381acffbedfdc553b9643d47924bf44e32238 (patch) | |
| tree | 878d3777e6b79c5e0712e38f63505dc6e7079f21 /pym/portage/env | |
| parent | 8c70715b17035030d5729972e01b2c2d3d842967 (diff) | |
| download | portage-581381acffbedfdc553b9643d47924bf44e32238.tar.gz portage-581381acffbedfdc553b9643d47924bf44e32238.tar.bz2 portage-581381acffbedfdc553b9643d47924bf44e32238.zip | |
Always pass encodings='utf_8' to codecs.open(), since otherwise it can
return non-unicode strings (at least in some cases, observed with
python-2.6.2). Don't use unicode in portage.util.getconfig() for now,
since shlex doesn't seem to support it (spurious \0 characters). If we
use unicode for config variables, it breaks shlex.split() calls on those
variables due to the same issue (spurious \0 characters).
svn path=/main/trunk/; revision=13845
Diffstat (limited to 'pym/portage/env')
| -rw-r--r-- | pym/portage/env/loaders.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pym/portage/env/loaders.py b/pym/portage/env/loaders.py index 7cd2600ae..7b4d72721 100644 --- a/pym/portage/env/loaders.py +++ b/pym/portage/env/loaders.py @@ -139,7 +139,7 @@ class FileLoader(DataLoader): # once, which may be expensive due to digging in child classes. func = self.lineParser for fn in RecursiveFileLoader(self.fname): - f = codecs.open(fn, mode='r', errors='replace') + f = codecs.open(fn, mode='r', encoding='utf_8', errors='replace') for line_num, line in enumerate(f): func(line, line_num, data, errors) return (data, errors) |