Make capsys more like stdio streams in python3. Resolves #1407.

1 files changed, 16 insertions, 0 deletions

diff --git a/_pytest/compat.py b/_pytest/compat.py
index e097dee51..09df385d1 100644
--- a/_pytest/compat.py
+++ b/_pytest/compat.py
@@ -251,3 +251,19 @@ else:
         except UnicodeError:
             errors = 'replace'
             return v.encode('ascii', errors)
+
+
+if _PY2:
+    from py.io import TextIO as CaptureIO
+else:
+    import io
+
+    class CaptureIO(io.TextIOWrapper):
+        def __init__(self):
+            super(CaptureIO, self).__init__(
+                io.BytesIO(),
+                encoding='UTF-8', newline='', write_through=True,
+            )
+
+        def getvalue(self):
+            return self.buffer.getvalue().decode('UTF-8')