1 files changed, 10 insertions, 14 deletions

diff --git a/Mailman/database/model/requests.py b/Mailman/database/model/requests.py
index ea917c2b9..037483c1a 100644
--- a/Mailman/database/model/requests.py
+++ b/Mailman/database/model/requests.py
@@ -49,23 +49,21 @@ class ListRequests:
 
     @property
     def count(self):
-        results = _Request.select_by(mailing_list=self.mailing_list)
-        return len(results)
+        return _Request.query.filter_by(mailing_list=self.mailing_list).count()
 
     def count_of(self, request_type):
-        results = _Request.select_by(mailing_list=self.mailing_list,
-                                     type=request_type)
-        return len(results)
+        return _Request.query.filter_by(mailing_list=self.mailing_list,
+                                        type=request_type).count()
 
     @property
     def held_requests(self):
-        results = _Request.select_by(mailing_list=self.mailing_list)
+        results = _Request.query.filter_by(mailing_list=self.mailing_list)
         for request in results:
             yield request
 
     def of_type(self, request_type):
-        results = _Request.select_by(mailing_list=self.mailing_list,
-                                     type=request_type)
+        results = _Request.query.filter_by(mailing_list=self.mailing_list,
+                                           type=request_type)
         for request in results:
             yield request
 
@@ -132,10 +130,8 @@ class Requests:
 class _Request(Entity):
     """Table for mailing list hold requests."""
 
-    has_field('key',            Unicode)
-    has_field('type',           EnumType)
-    has_field('data_hash',      Unicode)
+    key = Field(Unicode)
+    type = Field(EnumType)
+    data_hash = Field(Unicode)
     # Relationships
-    belongs_to('mailing_list',  of_kind=MAILINGLIST_KIND)
-    # Options
-    using_options(shortnames=True)
+    mailing_list = ManyToOne(MAILINGLIST_KIND)