Super duper.

 * Python 3-ify super() calls.
 * Remove a bunch of obsolete exception classes.

6 files changed, 8 insertions, 8 deletions

diff --git a/src/mailman/model/address.py b/src/mailman/model/address.py
index f243d976c..b632f54e1 100644
--- a/src/mailman/model/address.py
+++ b/src/mailman/model/address.py
@@ -55,7 +55,7 @@ class Address(Model):
         'Preferences', backref=backref('address', uselist=False))
 
     def __init__(self, email, display_name):
-        super(Address, self).__init__()
+        super().__init__()
         getUtility(IEmailValidator).validate(email)
         lower_case = email.lower()
         self.email = lower_case
diff --git a/src/mailman/model/bans.py b/src/mailman/model/bans.py
index 5894c1aef..a2a52a657 100644
--- a/src/mailman/model/bans.py
+++ b/src/mailman/model/bans.py
@@ -43,7 +43,7 @@ class Ban(Model):
     list_id = Column(Unicode, index=True)
 
     def __init__(self, email, list_id):
-        super(Ban, self).__init__()
+        super().__init__()
         self.email = email
         self.list_id = list_id
 
diff --git a/src/mailman/model/mailinglist.py b/src/mailman/model/mailinglist.py
index abc2c57f6..4160f6cc7 100644
--- a/src/mailman/model/mailinglist.py
+++ b/src/mailman/model/mailinglist.py
@@ -190,7 +190,7 @@ class MailingList(Model):
     welcome_message_uri = Column(Unicode)
 
     def __init__(self, fqdn_listname):
-        super(MailingList, self).__init__()
+        super().__init__()
         listname, at, hostname = fqdn_listname.partition('@')
         assert hostname, 'Bad list name: {0}'.format(fqdn_listname)
         self.list_name = listname
@@ -511,7 +511,7 @@ class AcceptableAlias(Model):
     alias = Column(Unicode, index=True, nullable=False)
 
     def __init__(self, mailing_list, alias):
-        super(AcceptableAlias, self).__init__()
+        super().__init__()
         self.mailing_list = mailing_list
         self.alias = alias
 
diff --git a/src/mailman/model/message.py b/src/mailman/model/message.py
index 477d957c4..c0fb1cd37 100644
--- a/src/mailman/model/message.py
+++ b/src/mailman/model/message.py
@@ -44,7 +44,7 @@ class Message(Model):
 
     @dbconnection
     def __init__(self, store, message_id, message_id_hash, path):
-        super(Message, self).__init__()
+        super().__init__()
         self.message_id = message_id
         self.message_id_hash = message_id_hash
         self.path = path
diff --git a/src/mailman/model/requests.py b/src/mailman/model/requests.py
index 831674aa1..83120e182 100644
--- a/src/mailman/model/requests.py
+++ b/src/mailman/model/requests.py
@@ -56,7 +56,7 @@ class DataPendable(dict):
                 key = '_pck_' + key
                 value = dumps(value).decode('raw-unicode-escape')
             clean_mapping[key] = value
-        super(DataPendable, self).update(clean_mapping)
+        super().update(clean_mapping)
 
 
 
@@ -159,7 +159,7 @@ class _Request(Model):
     mailing_list = relationship('MailingList')
 
     def __init__(self, key, request_type, mailing_list, data_hash):
-        super(_Request, self).__init__()
+        super().__init__()
         self.key = key
         self.request_type = request_type
         self.mailing_list = mailing_list
diff --git a/src/mailman/model/user.py b/src/mailman/model/user.py
index bc99ca327..7d74df7a9 100644
--- a/src/mailman/model/user.py
+++ b/src/mailman/model/user.py
@@ -78,7 +78,7 @@ class User(Model):
 
     @dbconnection
     def __init__(self, store, display_name=None, preferences=None):
-        super(User, self).__init__()
+        super().__init__()
         self._created_on = date_factory.now()
         user_id = uid_factory.new()
         assert store.query(User).filter_by(_user_id=user_id).count() == 0, (