Merge /var/git/mailman into mailman_292

2 files changed, 7 insertions, 6 deletions

diff --git a/src/mailman/interfaces/bans.py b/src/mailman/interfaces/bans.py
index 2e320965a..055ad69a3 100644
--- a/src/mailman/interfaces/bans.py
+++ b/src/mailman/interfaces/bans.py
@@ -46,6 +46,9 @@ class IBanManager(Interface):
         to an `IBanManager`.  To manage global bans, adapt ``None``.
         """
 
+    bans = Attribute(
+        """A `QuerySequence` over all the banned emails.""")
+
     def ban(email):
         """Ban an email address from subscribing to a mailing list.
 
@@ -94,8 +97,6 @@ class IBanManager(Interface):
         """
 
     def __iter__():
-        """Iterate over all banned addresses.
+        """An iterator over all the banned email addresses.
 
-        :return: The list of all banned addresses.
-        :rtype: list of `IBan`
-        """
+        :return: iterator over `IBan`"""
diff --git a/src/mailman/interfaces/subscriptions.py b/src/mailman/interfaces/subscriptions.py
index e707cf706..284261de5 100644
--- a/src/mailman/interfaces/subscriptions.py
+++ b/src/mailman/interfaces/subscriptions.py
@@ -148,8 +148,8 @@ class ISubscriptionService(Interface):
         :type list_id: string
         :param role: The member role.
         :type role: `MemberRole`
-        :return: The list of all memberships, which may be empty.
-        :rtype: list of `IMember`
+        :return: A sequence of all memberships, which may be empty.
+        :rtype: A `QuerySequence` of `IMember`
         """
 
     def find_member(subscriber=None, list_id=None, role=None):