diff options
author | Zac Medico <zmedico@gentoo.org> | 2011-12-16 11:32:39 -0800 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2011-12-16 11:32:39 -0800 |
commit | f1ec68632ff22b72b25c0d70cc2f2c137f957a91 (patch) | |
tree | db4e284be61464f9d129c88ff16c4e7b2466f56e /pym/_emerge/SpawnProcess.py | |
parent | f75fc7375ea902da2e96825ca27c8b7f5031a491 (diff) | |
download | portage-f1ec68632ff22b72b25c0d70cc2f2c137f957a91.tar.gz portage-f1ec68632ff22b72b25c0d70cc2f2c137f957a91.tar.bz2 portage-f1ec68632ff22b72b25c0d70cc2f2c137f957a91.zip |
SpawnProcess/AbstractPollTask: eliminate array
Since commit 30d2d0a9db486c5a70848ad5d27b37a3ec48f271, we use os.read()
due to bugs in array.fromfile(). So, eliminate array usage entirely.
Diffstat (limited to 'pym/_emerge/SpawnProcess.py')
-rw-r--r-- | pym/_emerge/SpawnProcess.py | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/pym/_emerge/SpawnProcess.py b/pym/_emerge/SpawnProcess.py index 9f83ef0de..ec5bf7d2f 100644 --- a/pym/_emerge/SpawnProcess.py +++ b/pym/_emerge/SpawnProcess.py @@ -183,7 +183,7 @@ class SpawnProcess(SubProcess): while True: try: if not write_successful: - buf.tofile(files.stdout) + files.stdout.write(buf) write_successful = True files.stdout.flush() break @@ -213,16 +213,7 @@ class SpawnProcess(SubProcess): fcntl.fcntl(files.stdout.fileno(), fcntl.F_GETFL) ^ os.O_NONBLOCK) - try: - buf.tofile(files.log) - except TypeError: - # array.tofile() doesn't work with GzipFile - try: - # Python >=3.2 - data = buf.tobytes() - except AttributeError: - data = buf.tostring() - files.log.write(data) + files.log.write(buf) files.log.flush() self._unregister_if_appropriate(event) |