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/util/_pty.py | |
| 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/util/_pty.py')
| -rw-r--r-- | pym/portage/util/_pty.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pym/portage/util/_pty.py b/pym/portage/util/_pty.py index f45ff0aa1..f308ccbce 100644 --- a/pym/portage/util/_pty.py +++ b/pym/portage/util/_pty.py @@ -112,12 +112,14 @@ def _test_pty_eof(fdopen_buffered=False): if not buf: eof = True else: - data.append(_unicode_decode(buf.tostring(), - encoding='utf_8', errors='strict')) + try: + data.append(buf.tobytes()) + except AttributeError: + data.append(buf.tostring()) master_file.close() - return test_string == ''.join(data) + return test_string == _unicode_decode(b''.join(data), encoding='utf_8', errors='strict') # If _test_pty_eof() can't be used for runtime detection of # http://bugs.python.org/issue5380, openpty can't safely be used |