fast-import-filter should produce binary output (Alexander Belchenko)

1 files changed, 8 insertions, 2 deletions

diff --git a/__init__.py b/__init__.py
index e17970d..63a1e31 100644
--- a/__init__.py
+++ b/__init__.py
@@ -66,9 +66,14 @@ def _run(source, processor_factory, control, params, verbose):
         import sys
         stream = sys.stdin
         try:
-            import msvcrt
             import os
-            msvcrt.setmode(sys.stdin.fileno(), os.O_BINARY)
+            if os.name == 'nt':
+                fileno = getattr(sys.stdin, 'fileno', None)
+                if fileno:
+                    no = fileno()
+                    if no >= 0:     # -1 means we're working as subprocess
+                        import msvcrt
+                        msvcrt.setmode(no, os.O_BINARY)
         except ImportError:
             pass
     else:
@@ -251,6 +256,7 @@ class cmd_fast_import_filter(Command):
                         ),
                      ]
     aliases = []
+    encoding_type = 'exact'
     def run(self, source, verbose=False, include_paths=None,
         exclude_paths=None):
         from bzrlib.plugins.fastimport.processors import filter_processor