11 files changed, 11 insertions, 11 deletions

diff --git a/src/mailman/database/alembic/__init__.py b/src/mailman/database/alembic/__init__.py
index af2596f04..ff74113d7 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
+from public import public
 
 
 public(alembic_cfg=Config(expand_path('python:mailman.config.alembic')))
diff --git a/src/mailman/database/alembic/env.py b/src/mailman/database/alembic/env.py
index c7a5e151d..e359b201d 100644
--- a/src/mailman/database/alembic/env.py
+++ b/src/mailman/database/alembic/env.py
@@ -19,11 +19,11 @@
 
 from alembic import context
 from contextlib import closing
-from mailman import public
 from mailman.config import config
 from mailman.core.initialize import initialize_1
 from mailman.database.model import Model
 from mailman.utilities.string import expand
+from public import public
 from sqlalchemy import create_engine
 
 
diff --git a/src/mailman/database/base.py b/src/mailman/database/base.py
index f57228029..586e1b20d 100644
--- a/src/mailman/database/base.py
+++ b/src/mailman/database/base.py
@@ -19,10 +19,10 @@
 
 import logging
 
-from mailman import public
 from mailman.config import config
 from mailman.interfaces.database import IDatabase
 from mailman.utilities.string import expand
+from public import public
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker
 from zope.interface import implementer
diff --git a/src/mailman/database/factory.py b/src/mailman/database/factory.py
index ff7fa59a9..4d003c39c 100644
--- a/src/mailman/database/factory.py
+++ b/src/mailman/database/factory.py
@@ -24,13 +24,13 @@ import alembic.command
 from alembic.migration import MigrationContext
 from alembic.script import ScriptDirectory
 from flufl.lock import Lock
-from mailman import public
 from mailman.config import config
 from mailman.database.alembic import alembic_cfg
 from mailman.database.model import Model
 from mailman.interfaces.database import (
     DatabaseError, IDatabase, IDatabaseFactory)
 from mailman.utilities.modules import call_name
+from public import public
 from sqlalchemy import MetaData
 from zope.interface import implementer
 from zope.interface.verify import verifyObject
diff --git a/src/mailman/database/helpers.py b/src/mailman/database/helpers.py
index b1dc381df..27c870058 100644
--- a/src/mailman/database/helpers.py
+++ b/src/mailman/database/helpers.py
@@ -19,7 +19,7 @@
 
 import sqlalchemy as sa
 
-from mailman import public
+from public import public
 
 
 @public
diff --git a/src/mailman/database/model.py b/src/mailman/database/model.py
index c2ee90491..098f62d4b 100644
--- a/src/mailman/database/model.py
+++ b/src/mailman/database/model.py
@@ -18,8 +18,8 @@
 """Base class for all database classes."""
 
 from contextlib import closing
-from mailman import public
 from mailman.config import config
+from public import public
 from sqlalchemy.ext.declarative import declarative_base
 
 
diff --git a/src/mailman/database/mysql.py b/src/mailman/database/mysql.py
index 0c0de54a9..cff16e208 100644
--- a/src/mailman/database/mysql.py
+++ b/src/mailman/database/mysql.py
@@ -17,9 +17,9 @@
 
 """MySQL database support"""
 
-from mailman import public
 from mailman.database.base import SABaseDatabase
 from mailman.database.model import Model
+from public import public
 
 
 @public
diff --git a/src/mailman/database/postgresql.py b/src/mailman/database/postgresql.py
index b1095e45f..d0c208a50 100644
--- a/src/mailman/database/postgresql.py
+++ b/src/mailman/database/postgresql.py
@@ -17,9 +17,9 @@
 
 """PostgreSQL database support."""
 
-from mailman import public
 from mailman.database.base import SABaseDatabase
 from mailman.database.model import Model
+from public import public
 from sqlalchemy import Integer
 
 
diff --git a/src/mailman/database/sqlite.py b/src/mailman/database/sqlite.py
index 08700bfb2..3659efaff 100644
--- a/src/mailman/database/sqlite.py
+++ b/src/mailman/database/sqlite.py
@@ -19,8 +19,8 @@
 
 import os
 
-from mailman import public
 from mailman.database.base import SABaseDatabase
+from public import public
 from urllib.parse import urlparse
 
 
diff --git a/src/mailman/database/transaction.py b/src/mailman/database/transaction.py
index 09dfda8e3..1b5368a39 100644
--- a/src/mailman/database/transaction.py
+++ b/src/mailman/database/transaction.py
@@ -18,8 +18,8 @@
 """Transactional support."""
 
 from contextlib import contextmanager
-from mailman import public
 from mailman.config import config
+from public import public
 
 
 @public
diff --git a/src/mailman/database/types.py b/src/mailman/database/types.py
index bbd040d96..10b826e7c 100644
--- a/src/mailman/database/types.py
+++ b/src/mailman/database/types.py
@@ -19,7 +19,7 @@
 
 import uuid
 
-from mailman import public
+from public import public
 from sqlalchemy import Integer
 from sqlalchemy.dialects import postgresql
 from sqlalchemy.ext.compiler import compiles