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/_emerge | |
| 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/_emerge')
| -rw-r--r-- | pym/_emerge/PipeReader.py | 6 | ||||
| -rw-r--r-- | pym/_emerge/SpawnProcess.py | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/pym/_emerge/PipeReader.py b/pym/_emerge/PipeReader.py index 375c98f6a..02e550dce 100644 --- a/pym/_emerge/PipeReader.py +++ b/pym/_emerge/PipeReader.py @@ -70,7 +70,11 @@ class PipeReader(AbstractPollTask): pass if buf: - self._read_data.append(buf.tostring()) + try: + data = buf.tobytes() + except AttributeError: + data = buf.tostring() + self._read_data.append(data) else: self._unregister() self.wait() diff --git a/pym/_emerge/SpawnProcess.py b/pym/_emerge/SpawnProcess.py index b72971c87..aa4160572 100644 --- a/pym/_emerge/SpawnProcess.py +++ b/pym/_emerge/SpawnProcess.py @@ -206,7 +206,11 @@ class SpawnProcess(SubProcess): buf.tofile(files.log) except TypeError: # array.tofile() doesn't work with GzipFile - files.log.write(buf.tostring()) + try: + data = buf.tobytes() + except AttributeError: + data = buf.tostring() + files.log.write(data) files.log.flush() else: self._unregister() |