summaryrefslogtreecommitdiff
path: root/src/mailman_pgp/database
diff options
context:
space:
mode:
authorJ08nY2017-08-07 19:58:20 +0200
committerJ08nY2017-08-07 19:58:20 +0200
commita869ebdad781ae9549681853f3581b7e315de444 (patch)
tree260cd4169a6a7fcba0b43aecc08d0b9ed430258e /src/mailman_pgp/database
parent52e9ef3b65b68e306f38d9d88d38334ce876b5e2 (diff)
downloadmailman-pgp-a869ebdad781ae9549681853f3581b7e315de444.tar.gz
mailman-pgp-a869ebdad781ae9549681853f3581b7e315de444.tar.zst
mailman-pgp-a869ebdad781ae9549681853f3581b7e315de444.zip
Diffstat (limited to 'src/mailman_pgp/database')
-rw-r--r--src/mailman_pgp/database/__init__.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/mailman_pgp/database/__init__.py b/src/mailman_pgp/database/__init__.py
index 2bd1feb..a7f0c64 100644
--- a/src/mailman_pgp/database/__init__.py
+++ b/src/mailman_pgp/database/__init__.py
@@ -19,14 +19,13 @@
import logging
from contextlib import contextmanager
-from mailman.config import config as mailman_config
from mailman.database.transaction import transaction as mailman_transaction
from mailman.utilities.string import expand
from public import public
from sqlalchemy import create_engine
from sqlalchemy.orm import scoped_session, sessionmaker
-from mailman_pgp.config import config
+from mailman_pgp.config import config, mm_config
from mailman_pgp.model.base import Base
log = logging.getLogger('mailman.plugin.pgp.database')
@@ -37,8 +36,7 @@ class Database:
"""A SQLAlchemy database."""
def __init__(self):
- url = config.get('db', 'url')
- self._url = expand(url, None, mailman_config.paths)
+ self._url = config.get_value('db', 'url')
log.debug('Creating database at {}'.format(self._url))
self.engine = create_engine(self._url)
self.scoped_session = scoped_session(sessionmaker(bind=self.engine))