[gentoo-commits] proj/portage:master commit in: pym/_emerge/

[Zac Medico]

commit:     5335ccb6558f22ddc926714dcba4443cc7333b6a
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 22 21:12:31 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Aug 22 21:12:31 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=5335ccb6

Optimize sys.std* flush code.

---
 pym/_emerge/EbuildMetadataPhase.py |    5 +++--
 pym/_emerge/SpawnProcess.py        |    5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pym/_emerge/EbuildMetadataPhase.py b/pym/_emerge/EbuildMetadataPhase.py
index d49c51f..9ab03e2 100644
--- a/pym/_emerge/EbuildMetadataPhase.py
+++ b/pym/_emerge/EbuildMetadataPhase.py
@@ -78,11 +78,12 @@ class EbuildMetadataPhase(SubProcess):
 		fd_pipes.setdefault(2, sys.__stderr__.fileno())
 
 		# flush any pending output
+		stdout_filenos = (sys.__stdout__.fileno(), sys.__stderr__.fileno())
 		for fd in fd_pipes.values():
-			if fd == sys.__stdout__.fileno():
+			if fd in stdout_filenos:
 				sys.__stdout__.flush()
-			if fd == sys.__stderr__.fileno():
 				sys.__stderr__.flush()
+				break
 
 		self._files = self._files_dict()
 		files = self._files

diff --git a/pym/_emerge/SpawnProcess.py b/pym/_emerge/SpawnProcess.py
index dfcf088..c7863c1 100644
--- a/pym/_emerge/SpawnProcess.py
+++ b/pym/_emerge/SpawnProcess.py
@@ -67,11 +67,12 @@ class SpawnProcess(SubProcess):
 		fd_pipes.setdefault(2, sys.__stderr__.fileno())
 
 		# flush any pending output
+		stdout_filenos = (sys.__stdout__.fileno(), sys.__stderr__.fileno())
 		for fd in fd_pipes.values():
-			if fd == sys.__stdout__.fileno():
+			if fd in stdout_filenos:
 				sys.__stdout__.flush()
-			if fd == sys.__stderr__.fileno():
 				sys.__stderr__.flush()
+				break
 
 		if logfile is not None: