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/__init__.py | |
| 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/__init__.py')
| -rw-r--r-- | pym/portage/tests/__init__.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pym/portage/tests/__init__.py b/pym/portage/tests/__init__.py index 4a5ced8a3..6e7380409 100644 --- a/pym/portage/tests/__init__.py +++ b/pym/portage/tests/__init__.py @@ -8,16 +8,16 @@ import time import unittest from portage import os -from portage import _fs_encoding +from portage import _encodings from portage import _unicode_encode from portage import _unicode_decode def main(): TEST_FILE = _unicode_encode('__test__', - encoding=_fs_encoding, errors='strict') + encoding=_encodings['fs'], errors='strict') svn_dirname = _unicode_encode('.svn', - encoding=_fs_encoding, errors='strict') + encoding=_encodings['fs'], errors='strict') suite = unittest.TestSuite() basedir = os.path.dirname(os.path.realpath(__file__)) testDirs = [] @@ -30,7 +30,7 @@ def main(): dirs.remove(svn_dirname) try: root = _unicode_decode(root, - encoding=_fs_encoding, errors='strict') + encoding=_encodings['fs'], errors='strict') except UnicodeDecodeError: continue |