Merge master into features

2019-03-19 01:07:10 +01:00
parent a624b84097 b696666f5a
commit 751c061d9a
6 changed files with 22 additions and 9 deletions
--- a/src/_pytest/capture.py
+++ b/src/_pytest/capture.py
@@ -539,7 +539,10 @@ class FDCaptureBinary(object):
            self.tmpfile_fd = tmpfile.fileno()

    def __repr__(self):
-        return "<FDCapture %s oldfd=%s>" % (self.targetfd, self.targetfd_save)
+        return "<FDCapture %s oldfd=%s>" % (
+            self.targetfd,
+            getattr(self, "targetfd_save", None),
+        )

    def start(self):
        """ Start capturing on targetfd using memorized tmpfile. """