diff options
| author | Barry Warsaw | 2014-11-30 21:51:03 -0500 |
|---|---|---|
| committer | Barry Warsaw | 2014-11-30 21:51:03 -0500 |
| commit | 44e43727be13e3554342c2b5b75b7dc42abdb18c (patch) | |
| tree | a0b97771f5d0856709ac8ab48c1e8f9eeecef352 /src/mailman/archiving/prototype.py | |
| parent | 065060e56ac2445b6749b60480e9c42573854c5e (diff) | |
| download | mailman-44e43727be13e3554342c2b5b75b7dc42abdb18c.tar.gz mailman-44e43727be13e3554342c2b5b75b7dc42abdb18c.tar.zst mailman-44e43727be13e3554342c2b5b75b7dc42abdb18c.zip | |
Diffstat (limited to 'src/mailman/archiving/prototype.py')
| -rw-r--r-- | src/mailman/archiving/prototype.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/mailman/archiving/prototype.py b/src/mailman/archiving/prototype.py index 153c44b69..e564b40b1 100644 --- a/src/mailman/archiving/prototype.py +++ b/src/mailman/archiving/prototype.py @@ -30,14 +30,13 @@ import errno import logging from datetime import timedelta -from mailbox import Maildir -from urlparse import urljoin - from flufl.lock import Lock, TimeOutError -from zope.interface import implementer - +from mailbox import Maildir from mailman.config import config from mailman.interfaces.archiver import IArchiver +from six.moves.urllib_parse import urljoin +from zope.interface import implementer + log = logging.getLogger('mailman.error') |
