summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/mailman/Utils.py4
-rw-r--r--src/mailman/tests/test_membership.py2
-rw-r--r--src/mailman/utilities/passwords.py (renamed from src/mailman/passwords.py)0
-rw-r--r--src/mailman/utilities/tests/test_passwords.py (renamed from src/mailman/tests/test_passwords.py)2
4 files changed, 2 insertions, 6 deletions
diff --git a/src/mailman/Utils.py b/src/mailman/Utils.py
index 384d25702..49b7d082e 100644
--- a/src/mailman/Utils.py
+++ b/src/mailman/Utils.py
@@ -33,20 +33,16 @@ import os
import re
import cgi
import errno
-import base64
-import random
import logging
# pylint: disable-msg=E0611,W0403
from email.errors import HeaderParseError
from email.header import decode_header, make_header
-from lazr.config import as_boolean
from string import ascii_letters, digits, whitespace
from zope.component import getUtility
import mailman.templates
-from mailman import passwords
from mailman.config import config
from mailman.core.i18n import _
from mailman.interfaces.languages import ILanguageManager
diff --git a/src/mailman/tests/test_membership.py b/src/mailman/tests/test_membership.py
index c3e40cfcc..8425cf65f 100644
--- a/src/mailman/tests/test_membership.py
+++ b/src/mailman/tests/test_membership.py
@@ -28,11 +28,11 @@ __all__ = [
import time
import unittest
-from mailman import passwords
from mailman.app.lifecycle import create_list, remove_list
from mailman.config import config
from mailman.interfaces.member import NotAMemberError
from mailman.testing.layers import ConfigLayer
+from mailman.utilities import passwords
diff --git a/src/mailman/passwords.py b/src/mailman/utilities/passwords.py
index c14584748..c14584748 100644
--- a/src/mailman/passwords.py
+++ b/src/mailman/utilities/passwords.py
diff --git a/src/mailman/tests/test_passwords.py b/src/mailman/utilities/tests/test_passwords.py
index 49f55e82f..60c201a5a 100644
--- a/src/mailman/tests/test_passwords.py
+++ b/src/mailman/utilities/tests/test_passwords.py
@@ -27,8 +27,8 @@ __all__ = [
import unittest
-from mailman import passwords
from mailman.core import errors
+from mailman.utilities import passwords