diff options
| author | Aurélien Bompard | 2016-10-26 10:30:58 +0200 |
|---|---|---|
| committer | Barry Warsaw | 2016-10-26 08:39:07 -0400 |
| commit | 88176f08e67a8f6ad706f371167167e75d4a3e04 (patch) | |
| tree | 29e4a10e478d6acc8b5342aa5976613b762c4bbc /src/mailman/model | |
| parent | e75d653f700dcf9a0a31550384d6511c47d024c1 (diff) | |
| download | mailman-88176f08e67a8f6ad706f371167167e75d4a3e04.tar.gz mailman-88176f08e67a8f6ad706f371167167e75d4a3e04.tar.zst mailman-88176f08e67a8f6ad706f371167167e75d4a3e04.zip | |
Implement the review suggestions
See !161
Diffstat (limited to 'src/mailman/model')
| -rw-r--r-- | src/mailman/model/listmanager.py | 10 | ||||
| -rw-r--r-- | src/mailman/model/tests/test_listmanager.py | 9 |
2 files changed, 12 insertions, 7 deletions
diff --git a/src/mailman/model/listmanager.py b/src/mailman/model/listmanager.py index c02736aab..e2519af5b 100644 --- a/src/mailman/model/listmanager.py +++ b/src/mailman/model/listmanager.py @@ -124,7 +124,11 @@ class ListManager: yield list_name, mail_host @dbconnection - def find(self, store, **kw): - query = store.query(MailingList).filter_by(**kw).order_by( - MailingList._list_id) + def find(self, store, *, advertised=None, mail_host=None): + query = store.query(MailingList) + if advertised is not None: + query = query.filter_by(advertised=advertised) + if mail_host is not None: + query = query.filter_by(mail_host=mail_host) + query = query.order_by(MailingList._list_id) return QuerySequence(query) diff --git a/src/mailman/model/tests/test_listmanager.py b/src/mailman/model/tests/test_listmanager.py index d69486370..1a643f248 100644 --- a/src/mailman/model/tests/test_listmanager.py +++ b/src/mailman/model/tests/test_listmanager.py @@ -105,11 +105,12 @@ class TestListManager(unittest.TestCase): def test_find_list(self): ant = create_list('ant@example.com') - create_list('bee@example.com') - ant.anonymous_list = True - result = getUtility(IListManager).find(anonymous_list=True) + bee = create_list('bee@example.com') + self.assertTrue(bee.advertised) + ant.advertised = False + result = getUtility(IListManager).find(advertised=True) self.assertEqual(len(result), 1) - self.assertEqual(result[0], ant) + self.assertEqual(result[0], bee) class TestListLifecycleEvents(unittest.TestCase): |