From 9597d3dafe123d500bcff27f5d2866bf6797ec4d Mon Sep 17 00:00:00 2001
From: uweschmitt <none@none>
Date: Thu, 7 Aug 2014 16:56:45 +0200
Subject: [PATCH] better fix as replacement for last commit

---
 _pytest/capture.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/_pytest/capture.py b/_pytest/capture.py
index f48dc19fa..8bcb49377 100644
--- a/_pytest/capture.py
+++ b/_pytest/capture.py
@@ -238,8 +238,12 @@ class EncodedFile(object):
         self.write(data)
 
     def __getattr__(self, name):
-        if name != "buffer":
-            return getattr(self.buffer, name)
+        return getattr(self.buffer, name)
+
+    def __setattr__(self, dd):
+        """default implementation for __setattr__ because unpickling causes infinite
+           recursion if only __getattr__ is overloaded and __setattr__ is missing"""
+        self.__dict__ = dd
 
 
 class MultiCapture(object):