From 19aaa3b178176bca8f70149ab7aab8bfb13bd7cb Mon Sep 17 00:00:00 2001
From: Fabio Zadrozny <fabiofz@gmail.com>
Date: Mon, 25 Feb 2019 15:58:45 -0300
Subject: [PATCH] Don't give error redirecting output with pythonw. Fixes
 #1023. (#1161)

---
 .../pydevd/_pydevd_bundle/pydevd_io.py        | 19 +++++++++++----
 .../pydevd/tests_python/test_pydevd_io.py     | 24 +++++++++++++++----
 2 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/src/ptvsd/_vendored/pydevd/_pydevd_bundle/pydevd_io.py b/src/ptvsd/_vendored/pydevd/_pydevd_bundle/pydevd_io.py
index 8e4859a9..5a3ea209 100644
--- a/src/ptvsd/_vendored/pydevd/_pydevd_bundle/pydevd_io.py
+++ b/src/ptvsd/_vendored/pydevd/_pydevd_bundle/pydevd_io.py
@@ -2,6 +2,7 @@ from _pydevd_bundle import pydevd_constants
 
 IS_PY3K = pydevd_constants.IS_PY3K
 
+
 class IORedirector:
     '''
     This class works to wrap a stream (stdout/stderr) with an additional redirect.
@@ -10,7 +11,7 @@ class IORedirector:
     def __init__(self, original, new_redirect, wrap_buffer=False):
         '''
         :param stream original:
-            The stream to be wrapped (usually stdout/stderr).
+            The stream to be wrapped (usually stdout/stderr, but could be None).
 
         :param stream new_redirect:
             Usually IOBuf (below).
@@ -27,14 +28,19 @@ class IORedirector:
         # Note that writing to the original stream may fail for some reasons
         # (such as trying to write something that's not a string or having it closed).
         for r in self._redirect_to:
-            r.write(s)
+            if hasattr(r, 'write'):
+                r.write(s)
 
     def isatty(self):
-        return self._redirect_to[0].isatty()
+        for r in self._redirect_to:
+            if hasattr(r, 'isatty'):
+                return r.isatty()
+        return False
 
     def flush(self):
         for r in self._redirect_to:
-            r.flush()
+            if hasattr(r, 'flush'):
+                r.flush()
 
     def __getattr__(self, name):
         for r in self._redirect_to:
@@ -42,11 +48,13 @@ class IORedirector:
                 return getattr(r, name)
         raise AttributeError(name)
 
+
 class IOBuf:
     '''This class works as a replacement for stdio and stderr.
     It is a buffer and when its contents are requested, it will erase what
     it has so far so that the next return will not return the same contents again.
     '''
+
     def __init__(self):
         self.buflist = []
         import os
@@ -56,7 +64,7 @@ class IOBuf:
         b = self.buflist
         self.buflist = []  # clear it
         return ''.join(b)  # bytes on py2, str on py3.
-    
+
     def write(self, s):
         if not IS_PY3K:
             if isinstance(s, unicode):
@@ -76,6 +84,7 @@ class IOBuf:
     def empty(self):
         return len(self.buflist) == 0
 
+
 class _RedirectionsHolder:
     _stack_stdout = []
     _stack_stderr = []
diff --git a/src/ptvsd/_vendored/pydevd/tests_python/test_pydevd_io.py b/src/ptvsd/_vendored/pydevd/tests_python/test_pydevd_io.py
index 0d5e3481..41a9a121 100644
--- a/src/ptvsd/_vendored/pydevd/tests_python/test_pydevd_io.py
+++ b/src/ptvsd/_vendored/pydevd/tests_python/test_pydevd_io.py
@@ -1,18 +1,33 @@
 from _pydevd_bundle.pydevd_io import IORedirector
 from _pydevd_bundle.pydevd_net_command_factory_xml import NetCommandFactory
+import pytest
 
 
 def test_io_redirector():
 
     class MyRedirection1(object):
-        pass
+        encoding = 'foo'
 
     class MyRedirection2(object):
         pass
 
+    my_redirector = IORedirector(MyRedirection1(), MyRedirection2(), wrap_buffer=True)
+    none_redirector = IORedirector(None, None, wrap_buffer=True)
+
+    assert my_redirector.encoding == 'foo'
+    with pytest.raises(AttributeError):
+        none_redirector.encoding
+
     # Check that we don't fail creating the IORedirector if the original
     # doesn't have a 'buffer'.
-    IORedirector(MyRedirection1(), MyRedirection2(), wrap_buffer=True)
+    for redirector in (
+            my_redirector,
+            none_redirector,
+        ):
+        redirector.write('test')
+        redirector.flush()
+
+    assert not redirector.isatty()
 
 
 class _DummyWriter(object):
@@ -29,12 +44,13 @@ class _DummyWriter(object):
         self.command_meanings.append(meaning)
         self.commands.append(cmd)
 
+
 class _DummyPyDb(object):
-    
+
     def __init__(self):
         self.cmd_factory = NetCommandFactory()
         self.writer = _DummyWriter()
-    
+
 
 def test_debug_console():
     from _pydev_bundle.pydev_console_utils import DebugConsoleStdIn