Rev 5233: (vila, Martin [gz]) More robust stream checking for subunit on windows in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5233 [merge]
revision-id: pqm at pqm.ubuntu.com-20100514122329-vhb5ozlixpg7bxsu
parent: pqm at pqm.ubuntu.com-20100514110532-qngntbe48hh01wkj
parent: v.ladeuil+lp at free.fr-20100514092034-dh7yczjvk2q67let
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2010-05-14 13:23:29 +0100
message:
  (vila, Martin [gz]) More robust stream checking for subunit on windows
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2010-05-11 08:44:59 +0000
+++ b/bzrlib/builtins.py	2010-05-14 09:20:34 +0000
@@ -3594,7 +3594,11 @@
             self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
             # On Windows, disable automatic conversion of '\n' to '\r\n' in
             # stdout, which would corrupt the subunit stream. 
-            if sys.platform == "win32" and sys.stdout.fileno() >= 0:
+            # FIXME: This has been fixed in subunit trunk (>0.0.5) so the
+            # following code can be deleted when it's sufficiently deployed
+            # -- vila/mgz 20100514
+            if (sys.platform == "win32"
+                and getattr(sys.stdout, 'fileno', None) is not None):
                 import msvcrt
                 msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
         if parallel: