floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hopefully final fix for strange infinite recursion bug

This commit is contained in:
uweschmitt 2014-08-11 12:57:47 +02:00
parent 5d024c7433
commit 224b3a2eda
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_pytest/capture.py
View File

@ -240,6 +240,8 @@ class EncodedFile(object):
def __getattr__(self, name): def __getattr__(self, name):
if hasattr(self, "buffer"): if hasattr(self, "buffer"):
return getattr(self.buffer, name) return getattr(self.buffer, name)
else:
raise AttributeError("attribute buffer of %r not set" % self)
class MultiCapture(object): class MultiCapture(object):

2
_pytest/main.py
View File

@ -159,6 +159,8 @@ class HookProxy:
self.config = config self.config = config
def __getattr__(self, name): def __getattr__(self, name):
if not hasattr(self, "config"):
raise AttributeError("attribute config of %r not set" % self)
hookmethod = getattr(self.config.hook, name) hookmethod = getattr(self.config.hook, name)
def call_matching_hooks(**kwargs): def call_matching_hooks(**kwargs):