Merged in davidszotten/pytest/dontreadfrominput-encoding (pull request #205)

add `encoding` attr to DontReadFromInput

_pytest/capture.py

@@ -428,6 +428,9 @@ class DontReadFromInput:
     because in automated test runs it is better to crash than
     hang indefinitely.
     """
+
+    encoding = None
+
     def read(self, *args):
         raise IOError("reading from stdin while output is captured")
     readline = read

testing/test_capture.py

@@ -1025,6 +1025,18 @@ def test_error_attribute_issue555(testdir):
     reprec.assertoutcome(passed=1)
 
 
+def test_dontreadfrominput_has_encoding(testdir):
+    testdir.makepyfile("""
+        import sys
+        def test_capattr():
+            # should not raise AttributeError
+            assert sys.stdout.encoding
+            assert sys.stderr.encoding
+    """)
+    reprec = testdir.inline_run()
+    reprec.assertoutcome(passed=1)
+
+
 def test_pickling_and_unpickling_enocded_file():
     # See https://bitbucket.org/hpk42/pytest/pull-request/194
     # pickle.loads() raises infinite recursion if