check __exception_formatter__ also in extractStack

zopefoundation · Aug 12, 2015 · 11cbc27 · 11cbc27
1 parent 70384f9
commit 11cbc27
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/zope/exceptions/exceptionformatter.py b/src/zope/exceptions/exceptionformatter.py
@@ -205,6 +205,14 @@ def extractStack(self, f=None):
         __exception_formatter__ = 1
         result = []
         while f is not None:
+            if f.f_locals.get('__exception_formatter__'):
+                # Stop recursion.
+                result.append('(Recursive extractStack() stopped, '
+                              'trying traceback.format_stack)\n')
+                res = traceback.format_stack(f)
+                res.reverse()
+                result.extend(res)
+                break
             line = self.formatLine(f=f)
             result.append(line + '\n')
             f = f.f_back