Refactor IDatabase interface so that the user_manager, list_manager,

message_store, and pendings 'databases' hang off the IDatabase object attached
to the config object.  For IPending, no adaptation is necessary.

1 files changed, 2 insertions, 6 deletions

diff --git a/Mailman/database/__init__.py b/Mailman/database/__init__.py
index e27ad8cf1..db105e21d 100644
--- a/Mailman/database/__init__.py
+++ b/Mailman/database/__init__.py
@@ -50,6 +50,7 @@ class StockDatabase:
         self.list_manager = None
         self.user_manager = None
         self.message_store = None
+        self.pendings = None
 
     def initialize(self):
         from Mailman.LockFile import LockFile
@@ -63,13 +64,8 @@ class StockDatabase:
         self.list_manager = ListManager()
         self.user_manager = UserManager()
         self.message_store = MessageStore()
+        self.pendings = Pendings()
         self.flush()
 
     def flush(self):
         objectstore.flush()
-
-    def __conform__(self, protocol):
-        if protocol is IPending:
-            return Pendings()
-        # Let the rest of the adaptation machinery take a crack at it.
-        return None