2 files changed, 5 insertions, 5 deletions

diff --git a/src/mailman/database/alembic/__init__.py b/src/mailman/database/alembic/__init__.py
index c9626cc9f..af2596f04 100644
--- a/src/mailman/database/alembic/__init__.py
+++ b/src/mailman/database/alembic/__init__.py
@@ -18,8 +18,8 @@
 """Alembic configuration initization."""
 
 from alembic.config import Config
+from mailman import public
 from mailman.utilities.modules import expand_path
 
 
-alembic_cfg = Config(expand_path('python:mailman.config.alembic'))
-__all__ = ['alembic_cfg']
+public(alembic_cfg=Config(expand_path('python:mailman.config.alembic')))
diff --git a/src/mailman/database/model.py b/src/mailman/database/model.py
index b9ba54c8d..6019b7488 100644
--- a/src/mailman/database/model.py
+++ b/src/mailman/database/model.py
@@ -18,6 +18,7 @@
 """Base class for all database classes."""
 
 from contextlib import closing
+from mailman import public
 from mailman.config import config
 from sqlalchemy.ext.declarative import declarative_base
 
@@ -36,7 +37,7 @@ class ModelMeta:
             try:
                 # Delete all the tables in reverse foreign key dependency
                 # order.  http://tinyurl.com/on8dy6f
-                for table in reversed(Model.metadata.sorted_tables):
+                for table in reversed(Model.metadata.sorted_tables):   # noqa
                     connection.execute(table.delete())
             except:
                 transaction.rollback()
@@ -45,5 +46,4 @@ class ModelMeta:
                 transaction.commit()
 
 
-Model = declarative_base(cls=ModelMeta)
-__all__ = ['Model']
+public(Model=declarative_base(cls=ModelMeta))