From f7282b84bd2e3baaa18fd21f361aca792269f5a5 Mon Sep 17 00:00:00 2001
From: uweschmitt <none@none>
Date: Thu, 7 Aug 2014 16:13:12 +0200
Subject: [PATCH] fixed strange infinite recursion bug

---
 _pytest/capture.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/_pytest/capture.py b/_pytest/capture.py
index 0b7f615bc..f48dc19fa 100644
--- a/_pytest/capture.py
+++ b/_pytest/capture.py
@@ -238,7 +238,8 @@ class EncodedFile(object):
         self.write(data)
 
     def __getattr__(self, name):
-        return getattr(self.buffer, name)
+        if name != "buffer":
+            return getattr(self.buffer, name)
 
 
 class MultiCapture(object):