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/tests/ebuild | |
| 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/tests/ebuild')
| -rw-r--r-- | pym/portage/tests/ebuild/test_spawn.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pym/portage/tests/ebuild/test_spawn.py b/pym/portage/tests/ebuild/test_spawn.py index 908fce606..97a5f42d0 100644 --- a/pym/portage/tests/ebuild/test_spawn.py +++ b/pym/portage/tests/ebuild/test_spawn.py @@ -6,8 +6,7 @@ import codecs import errno import sys from portage import os -from portage import _content_encoding -from portage import _fs_encoding +from portage import _encodings from portage import _unicode_encode from portage.tests import TestCase @@ -34,8 +33,8 @@ class SpawnTestCase(TestCase): free=1, fd_pipes={0:sys.stdin.fileno(), 1:null_fd, 2:null_fd}) os.close(null_fd) f = codecs.open(_unicode_encode(logfile, - encoding=_fs_encoding, errors='strict'), - mode='r', encoding=_content_encoding, errors='strict') + encoding=_encodings['fs'], errors='strict'), + mode='r', encoding=_encodings['content'], errors='strict') log_content = f.read() f.close() # When logging passes through a pty, this comparison will fail |