Ticket #5193: bug5193-1.patch

twisted/persisted/styles.py

@@ -12 +12 @@
 import types
 import copy_reg
 import copy
+import inspect
 
 try:
     import cStringIO as StringIO
@@ -20 +21 @@
 
 # Twisted Imports
 from twisted.python import log
+from twisted.python import reflect
 
 oldModules = {}
 
@@ -143 +145 @@
         obj.versionUpgrade()
         return obj
 
-from twisted.python import reflect
-
 def _aybabtu(c):
-    l = []
-    for b in reflect.allYourBase(c, Versioned):
-        if b not in l and b is not Versioned:
+    """
+    Get all of the parent classes of C{c}, not including C{c} itself, which are
+    strict subclasses of L{Versioned}.
+
+    The name comes from "all your base are belong to us", from the deprecated
+    L{twisted.python.reflect.allYourBase} function.
+
+    @param c: a class
+    @returns: list of classes
+    """
+    # begin with two classes that should *not* be included in the
+    # final result
+    l = [ c, Versioned ]
+    for b in inspect.getmro(c):
+        if b not in l and issubclass(b, Versioned):
             l.append(b)
-    return l
+    # return all except the unwanted classes
+    return l[2:]
 
 class Versioned:
     """

twisted/test/test_persisted.py

@@ -112 +112 @@
         styles.doUpgrade()
         self.failUnless(x.y.upgraded)
 
+
+
+class VersionedSubClass(styles.Versioned):
+    pass
+
+
+
+class SecondVersionedSubClass(styles.Versioned):
+    pass
+
+
+
+class VersionedSubSubClass(VersionedSubClass):
+    pass
+
+
+
+class VersionedDiamondSubClass(VersionedSubSubClass, SecondVersionedSubClass):
+    pass
+
+
+
+class AybabtuTests(unittest.TestCase):
+
+
+    def testAybabtu(self):
+        """
+        Test styles._aybabtu, including edge cases.
+        """
+        self.assertEqual(styles._aybabtu(styles.Versioned), [])
+        self.assertEqual(styles._aybabtu(VersionedSubClass), [])
+        self.assertEqual(styles._aybabtu(VersionedSubSubClass),
+            [VersionedSubClass])
+        self.assertEqual(styles._aybabtu(VersionedDiamondSubClass),
+            [VersionedSubSubClass, VersionedSubClass, SecondVersionedSubClass])
+
+
 class MyEphemeral(styles.Ephemeral):
 
     def __init__(self, x):

(a) /dev/null vs. (b) b/twisted/topfiles/5193.bugfix

@@ +1 @@
+twisted.persisted.styles no longer uses the deprecated allYourBase function