summaryrefslogtreecommitdiff
path: root/mailman/passwords.py
diff options
context:
space:
mode:
authorBarry Warsaw2008-09-27 09:26:23 -0400
committerBarry Warsaw2008-09-27 09:26:23 -0400
commit512145d93efc318adc0250dd53f4a53d8738f679 (patch)
treeb46813032dab87bda6ce8ffc1a867e6505050d93 /mailman/passwords.py
parent6f4351721559e8b7b577d3a01216fec88121ed11 (diff)
parent4600557c49f2259925dca45b302b2a78629b0b38 (diff)
downloadmailman-512145d93efc318adc0250dd53f4a53d8738f679.tar.gz
mailman-512145d93efc318adc0250dd53f4a53d8738f679.tar.zst
mailman-512145d93efc318adc0250dd53f4a53d8738f679.zip
thread merge
Diffstat (limited to 'mailman/passwords.py')
-rw-r--r--mailman/passwords.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/mailman/passwords.py b/mailman/passwords.py
index b353e7710..65bf8de05 100644
--- a/mailman/passwords.py
+++ b/mailman/passwords.py
@@ -30,7 +30,7 @@ from base64 import urlsafe_b64decode as decode
from base64 import urlsafe_b64encode as encode
from munepy import Enum
-from mailman import Errors
+from mailman.core import errors
SALT_LENGTH = 20 # bytes
ITERATIONS = 2000
@@ -221,7 +221,7 @@ def make_secret(password, scheme=None):
password = password.encode('utf-8')
scheme_class = _SCHEMES_BY_ENUM.get(scheme)
if not scheme_class:
- raise Errors.BadPasswordSchemeError(scheme)
+ raise errors.BadPasswordSchemeError(scheme)
secret = scheme_class.make_secret(password)
return '{%s}%s' % (scheme_class.TAG, secret)