Ticket #4928: 4928-stop-using-allyourbase.patch

twisted/python/failure.py

@@ -17 +17 @@
 import inspect
 import opcode
 from cStringIO import StringIO
+from inspect import getmro
 
 from twisted.python import reflect
 
@@ -280 +281 @@
                 ])
             tb = tb.tb_next
         if inspect.isclass(self.type) and issubclass(self.type, Exception):
-            parentCs = reflect.allYourBase(self.type)
+            parentCs = getmro(self.type)
             self.parents = map(reflect.qual, parentCs)
             self.parents.append(reflect.qual(self.type))
         else:

twisted/trial/test/test_reporter.py

@@ -9 +9 @@
 
 
 import errno, sys, os, re, StringIO
+from inspect import getmro
 
 from twisted.internet.utils import suppressWarnings
 from twisted.python import log
 from twisted.python.failure import Failure
-from twisted.python.reflect import allYourBase
 from twisted.trial import itrial, unittest, runner, reporter, util
 from twisted.trial.reporter import UncleanWarningsReporterWrapper
 from twisted.trial.test import erroneous
@@ -1219 +1219 @@
         method = getattr(klass, methodName, None)
         if method is None:
             return
-        for base in [klass] + allYourBase(klass):
+        for base in [klass] + getmro(klass):
             try:
                 delattr(base, methodName)
             except (AttributeError, TypeError):