5 files changed, 2 insertions, 6 deletions
diff --git a/src/mailman/core/errors.py b/src/mailman/core/errors.py
index 3faa46884..2c5568b6d 100644
--- a/src/mailman/core/errors.py
+++ b/src/mailman/core/errors.py
@@ -35,7 +35,6 @@ __all__ = [
     'BadPasswordSchemeError',
     'CantDigestError',
     'DiscardMessage',
-    'EmailAddressError',
     'HandlerError',
     'HoldMessage',
     'LostHeldMessage',
@@ -43,7 +42,6 @@ __all__ = [
     'MailmanException',
     'MemberError',
     'MustDigestError',
-    'NotAMemberError',
     'PasswordError',
     'RejectMessage',
     ]
diff --git a/src/mailman/core/i18n.py b/src/mailman/core/i18n.py
index 372a4685d..48e664f1f 100644
--- a/src/mailman/core/i18n.py
+++ b/src/mailman/core/i18n.py
@@ -24,7 +24,6 @@ __all__ = [
     '_',
     'ctime',
     'initialize',
-    'set_language',
     ]
 
 
diff --git a/src/mailman/core/initialize.py b/src/mailman/core/initialize.py
index e55e97ee5..f64e267d7 100644
--- a/src/mailman/core/initialize.py
+++ b/src/mailman/core/initialize.py
@@ -37,7 +37,6 @@ __all__ = [
 
 
 import os
-import sys
 
 from pkg_resources import resource_string
 from zope.configuration import xmlconfig
diff --git a/src/mailman/core/pipelines.py b/src/mailman/core/pipelines.py
index ffd196f85..66a47eac0 100644
--- a/src/mailman/core/pipelines.py
+++ b/src/mailman/core/pipelines.py
@@ -116,7 +116,7 @@ def initialize():
         verifyObject(IHandler, handler)
         assert handler.name not in config.handlers, (
             'Duplicate handler "{0}" found in {1}'.format(
-                handler.name, handler_finder))
+                handler.name, handler_class))
         config.handlers[handler.name] = handler
     # Set up some pipelines.
     for pipeline_class in (BuiltInPipeline, VirginPipeline):
diff --git a/src/mailman/core/rules.py b/src/mailman/core/rules.py
index 015d0d2e4..38f09d39f 100644
--- a/src/mailman/core/rules.py
+++ b/src/mailman/core/rules.py
@@ -41,5 +41,5 @@ def initialize():
         verifyObject(IRule, rule)
         assert rule.name not in config.rules, (
             'Duplicate rule "{0}" found in {1}'.format(
-                rule.name, rule_finder))
+                rule.name, rule_class))
         config.rules[rule.name] = rule