merge trunk

1 files changed, 9 insertions, 1 deletions

diff --git a/src/mailman/interfaces/member.py b/src/mailman/interfaces/member.py
index c06cc95b1..d863e1ef1 100644
--- a/src/mailman/interfaces/member.py
+++ b/src/mailman/interfaces/member.py
@@ -123,7 +123,7 @@ class MembershipIsBannedError(MembershipError):
     """The address is not allowed to subscribe to the mailing list."""
 
     def __init__(self, mlist, address):
-        super(MembershipIsBannedError, self).__init__()
+        super().__init__()
         self._mlist = mlist
         self._address = address
 
@@ -175,6 +175,14 @@ class IMember(Interface):
     user = Attribute(
         """The user associated with this member.""")
 
+    subscriber = Attribute(
+        """The object representing how this member is subscribed.
+
+        This will be an ``IAddress`` if the user is subscribed via an explicit
+        address, otherwise if the the user is subscribed via their preferred
+        address, it will be an ``IUser``.
+        """)
+
     preferences = Attribute(
         """This member's preferences.""")