Merge branch 'master' into features

2017-07-20 22:10:58 -03:00
parent 9e3e58af60 da12c52347
commit abb5d20841
4 changed files with 22 additions and 2 deletions
--- a/_pytest/compat.py
+++ b/_pytest/compat.py
@@ -282,7 +282,15 @@ def _setup_collect_fakemodule():


 if _PY2:
-    from py.io import TextIO as CaptureIO
+    # Without this the test_dupfile_on_textio will fail, otherwise CaptureIO could directly inherit from StringIO.
+    from py.io import TextIO
+
+    class CaptureIO(TextIO):
+
+        @property
+        def encoding(self):
+            return getattr(self, '_encoding', 'UTF-8')
+
 else:
    import io