From: Zac Medico Date: Wed, 11 Mar 2009 06:02:25 +0000 (-0000) Subject: For python-3.0 compatibility, open files in binary mode inside X-Git-Tag: v2.1.6.8~148 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a0cded292419b0834323233ae01975dbb25d0b83;p=portage.git For python-3.0 compatibility, open files in binary mode inside SpawnProcess._start(). (trunk r12666) svn path=/main/branches/2.1.6/; revision=12929 --- diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 9737952b3..aeb4f0b5e 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -2255,19 +2255,19 @@ class SpawnProcess(SubProcess): else: fd_pipes[0] = fd_pipes_orig[0] - files.process = os.fdopen(master_fd, 'r') + files.process = os.fdopen(master_fd, 'rb') if logfile is not None: fd_pipes[1] = slave_fd fd_pipes[2] = slave_fd - files.log = open(logfile, "a") + files.log = open(logfile, mode='ab') portage.util.apply_secpass_permissions(logfile, uid=portage.portage_uid, gid=portage.portage_gid, mode=0660) if not self.background: - files.stdout = os.fdopen(os.dup(fd_pipes_orig[1]), 'w') + files.stdout = os.fdopen(os.dup(fd_pipes_orig[1]), 'wb') output_handler = self._output_handler