For python-3.0 compatibility, open files in binary mode inside
authorZac Medico <zmedico@gentoo.org>
Sat, 21 Feb 2009 00:18:45 +0000 (00:18 -0000)
committerZac Medico <zmedico@gentoo.org>
Sat, 21 Feb 2009 00:18:45 +0000 (00:18 -0000)
SpawnProcess._start().

svn path=/main/trunk/; revision=12666

pym/_emerge/__init__.py

index 7505deda0f1e26e2bc7e1307188f7d1e505d6181..80f0372f8aa912e7d18e6c115d85a15e9ad6eaff 100644 (file)
@@ -2274,19 +2274,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