summaryrefslogtreecommitdiff
path: root/src/mailman/utilities/passwords.py
diff options
context:
space:
mode:
authorBarry Warsaw2012-11-04 15:49:08 -0500
committerBarry Warsaw2012-11-04 15:49:08 -0500
commit89f6e779db51478ea95b71f2ad3dc9d7f5f51e05 (patch)
treee1054919eb00e3abf73b4387277c4c79aca52b64 /src/mailman/utilities/passwords.py
parent23fca2302ea2a8c5bad0a7aa450ea210ace7cf27 (diff)
downloadmailman-89f6e779db51478ea95b71f2ad3dc9d7f5f51e05.tar.gz
mailman-89f6e779db51478ea95b71f2ad3dc9d7f5f51e05.tar.zst
mailman-89f6e779db51478ea95b71f2ad3dc9d7f5f51e05.zip
Diffstat (limited to 'src/mailman/utilities/passwords.py')
-rw-r--r--src/mailman/utilities/passwords.py11
1 files changed, 2 insertions, 9 deletions
diff --git a/src/mailman/utilities/passwords.py b/src/mailman/utilities/passwords.py
index 95c85c47a..cf08260fa 100644
--- a/src/mailman/utilities/passwords.py
+++ b/src/mailman/utilities/passwords.py
@@ -27,22 +27,15 @@ __all__ = [
from passlib.context import CryptContext
-from pkg_resources import resource_string
+from mailman.config.config import load_external
from mailman.interfaces.configuration import ConfigurationUpdatedEvent
class PasswordContext:
def __init__(self, config):
- # Is the context coming from a file system or Python path?
- if config.passwords.path.startswith('python:'):
- resource_path = config.passwords.path[7:]
- package, dot, resource = resource_path.rpartition('.')
- config_string = resource_string(package, resource + '.cfg')
- else:
- with open(config.passwords.path, 'rb') as fp:
- config_string = fp.read()
+ config_string = load_external(config.passwords.configuration)
self._context = CryptContext.from_string(config_string)
def encrypt(self, secret):