From 148fc6a73f3fa3b53039ee3292e222015e96bc79 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 24 Aug 2011 19:48:17 -0700 Subject: python3.2 fixes: use array.tobytes() --- pym/portage/util/_pty.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'pym/portage/util/_pty.py') 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 -- cgit v1.2.3-1-g7c22