summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBarry Warsaw2014-12-01 22:42:49 -0500
committerBarry Warsaw2014-12-01 22:42:49 -0500
commitc7d6e75b453508d83a4676f5b60444adcd182c1f (patch)
tree9c428fe4dd74ccab531c899758d8cc033c9a0944 /src
parentfecb83c9b7b9c8d7c3d8ee7cf16be8fb1e76fedc (diff)
downloadmailman-c7d6e75b453508d83a4676f5b60444adcd182c1f.tar.gz
mailman-c7d6e75b453508d83a4676f5b60444adcd182c1f.tar.zst
mailman-c7d6e75b453508d83a4676f5b60444adcd182c1f.zip
test_mailinglist.py passes.
Diffstat (limited to 'src')
-rw-r--r--src/mailman/archiving/mailarchive.py6
-rw-r--r--src/mailman/archiving/mhonarc.py5
2 files changed, 4 insertions, 7 deletions
diff --git a/src/mailman/archiving/mailarchive.py b/src/mailman/archiving/mailarchive.py
index 421d65cbd..7c5235639 100644
--- a/src/mailman/archiving/mailarchive.py
+++ b/src/mailman/archiving/mailarchive.py
@@ -25,13 +25,11 @@ __all__ = [
]
-from urllib import quote
-from urlparse import urljoin
-from zope.interface import implementer
-
from mailman.config import config
from mailman.config.config import external_configuration
from mailman.interfaces.archiver import ArchivePolicy, IArchiver
+from six.moves.urllib_parse import quote, urljoin
+from zope.interface import implementer
diff --git a/src/mailman/archiving/mhonarc.py b/src/mailman/archiving/mhonarc.py
index 4606925e0..1f9102f19 100644
--- a/src/mailman/archiving/mhonarc.py
+++ b/src/mailman/archiving/mhonarc.py
@@ -28,13 +28,12 @@ __all__ = [
import logging
import subprocess
-from urlparse import urljoin
-from zope.interface import implementer
-
from mailman.config import config
from mailman.config.config import external_configuration
from mailman.interfaces.archiver import IArchiver
from mailman.utilities.string import expand
+from six.moves.urllib_parse import urljoin
+from zope.interface import implementer
log = logging.getLogger('mailman.archiver')