diff options
| author | Mark Sapiro | 2016-12-04 15:40:12 -0800 |
|---|---|---|
| committer | Mark Sapiro | 2016-12-04 15:40:12 -0800 |
| commit | b7eef6badf3fc6e6bd0534ca58647f0e8219e977 (patch) | |
| tree | 7e2999232b8e3c6b54fffc5a31a90414c167ffe1 /src/mailman/model/template.py | |
| parent | 0846595ab8f75afda49fcdf35abe87b609af55d5 (diff) | |
| parent | b50fc4b57c9a8886407fd9ae0b88bdaa2075d3a2 (diff) | |
| download | mailman-b7eef6badf3fc6e6bd0534ca58647f0e8219e977.tar.gz mailman-b7eef6badf3fc6e6bd0534ca58647f0e8219e977.tar.zst mailman-b7eef6badf3fc6e6bd0534ca58647f0e8219e977.zip | |
Merge gitlab.com:mailman/mailman into to_moderators
Diffstat (limited to 'src/mailman/model/template.py')
| -rw-r--r-- | src/mailman/model/template.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mailman/model/template.py b/src/mailman/model/template.py index b09c644bb..eb776293f 100644 --- a/src/mailman/model/template.py +++ b/src/mailman/model/template.py @@ -19,7 +19,6 @@ import logging -from mailman import public from mailman.config import config from mailman.database.model import Model from mailman.database.transaction import dbconnection @@ -32,6 +31,7 @@ from mailman.interfaces.template import ( from mailman.utilities import protocols from mailman.utilities.i18n import find from mailman.utilities.string import expand +from public import public from requests import HTTPError from sqlalchemy import Column, Integer from urllib.error import URLError |