diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-08-24 19:48:17 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-08-24 19:48:17 -0700 |
| commit | 148fc6a73f3fa3b53039ee3292e222015e96bc79 (patch) | |
| tree | 53086f32b3be1359d77d90e1e094fdcb75d0a5d9 /pym/portage/tests/ebuild | |
| parent | a12c63842b28e29f3bc6718e6d940d5b697f010f (diff) | |
| download | portage-148fc6a73f3fa3b53039ee3292e222015e96bc79.tar.gz portage-148fc6a73f3fa3b53039ee3292e222015e96bc79.tar.bz2 portage-148fc6a73f3fa3b53039ee3292e222015e96bc79.zip | |
python3.2 fixes: use array.tobytes()
Diffstat (limited to 'pym/portage/tests/ebuild')
| -rw-r--r-- | pym/portage/tests/ebuild/test_array_fromfile_eof.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/pym/portage/tests/ebuild/test_array_fromfile_eof.py b/pym/portage/tests/ebuild/test_array_fromfile_eof.py index d8277f275..f965b8384 100644 --- a/pym/portage/tests/ebuild/test_array_fromfile_eof.py +++ b/pym/portage/tests/ebuild/test_array_fromfile_eof.py @@ -1,4 +1,4 @@ -# Copyright 2009 Gentoo Foundation +# Copyright 2009-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 import array @@ -35,9 +35,12 @@ class ArrayFromfileEofTestCase(TestCase): if not a: eof = True else: - data.append(_unicode_decode(a.tostring(), - encoding='utf_8', errors='strict')) + try: + data.append(a.tobytes()) + except AttributeError: + data.append(a.tostring()) f.close() - self.assertEqual(input_data, ''.join(data)) + self.assertEqual(input_data, _unicode_decode(b''.join(data), + encoding='utf_8', errors='strict')) |