Merge pull request #48 from ploxiln/always_default_pty

run: change stdin-based pty disable logic

Author: ploxiln

fabric/io.py

@@ -272,7 +272,7 @@ def input_loop(chan, f, using_pty):
         if byte:
             chan.sendall(byte)
             # Optionally echo locally, if needed.
-            if not using_pty and is_stdin and env.echo_stdin:
+            if (not using_pty) and is_stdin and env.echo_stdin:
                 # Not using fastprint() here -- it prints as 'user'
                 # output level, don't want it to be accidentally hidden
                 sys.stdout.write(byte)

fabric/operations.py

@@ -23,7 +23,7 @@
 from fabric.state import env, connections, output, win32, default_channel
 from fabric.thread_handling import ThreadHandler
 from fabric.utils import (
-    abort, error, handle_prompt_abort, indent, _pty_size, warn, apply_lcwd, isatty
+    abort, error, handle_prompt_abort, indent, _pty_size, warn, apply_lcwd,
 )
 
 
@@ -737,7 +737,7 @@ def _execute(channel, command, pty=True, combine_stderr=None,
 
     # Assume pty use, and allow overriding of this either via kwarg or env
     # var.  (invoke_shell always wants a pty no matter what.)
-    using_pty = invoke_shell or (pty and env.always_use_pty and isatty(stdin))
+    using_pty = invoke_shell or (pty and env.always_use_pty and (stdin is sys.stdin))
 
     # What to do with CTRl-C?
     remote_interrupt = env.remote_interrupt

tests/test_utils.py

@@ -92,7 +92,7 @@ def test_abort_message_only_printed_once():
     # perform when they are allowed to bubble all the way to the top. So, we
     # invoke a subprocess and look at its stderr instead.
     with quiet():
-        result = local(sys.executable + " -m fabric.__main__ -f tests/support/aborts.py kaboom", capture=True)
+        result = local(sys.executable + " -Wignore -m fabric.__main__ -f tests/support/aborts.py kaboom", capture=True)
     # When error in #1318 is present, this has an extra "It burns!" at end of
     # stderr string.
     eq_(result.stderr, "Fatal error: It burns!\n\nAborting.")