jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Optimize TracebackEntry.ishidden 

The expected behavior is that there is no "__tracebackhide__" attribute,
so use `getattr` instead of multiple try/except.
This commit is contained in:
Daniel Hahler 2019-03-13 22:46:34 +01:00
parent 90597226eb
commit 4d21dc4f2d
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/_pytest/_code/code.py
View File

@ -241,25 +241,20 @@ class TracebackEntry(object):
def ishidden(self): def ishidden(self):
""" return True if the current frame has a var __tracebackhide__ """ return True if the current frame has a var __tracebackhide__
resolving to True resolving to True.
If __tracebackhide__ is a callable, it gets called with the If __tracebackhide__ is a callable, it gets called with the
ExceptionInfo instance and can decide whether to hide the traceback. ExceptionInfo instance and can decide whether to hide the traceback.
mostly for internal use mostly for internal use
""" """
try: f = self.frame
tbh = self.frame.f_locals["__tracebackhide__"] tbh = f.f_locals.get(
except KeyError: "__tracebackhide__", f.f_globals.get("__tracebackhide__", False)
try: )
tbh = self.frame.f_globals["__tracebackhide__"] if tbh and callable(tbh):
except KeyError:
return False
if callable(tbh):
return tbh(None if self._excinfo is None else self._excinfo()) return tbh(None if self._excinfo is None else self._excinfo())
else: return tbh
return tbh
def __str__(self): def __str__(self):
try: try: