From 631fd941ecdaffcc133217fe5e69500f5e04f816 Mon Sep 17 00:00:00 2001 From: krateng Date: Sat, 26 Feb 2022 21:51:33 +0100 Subject: [PATCH] Cleanup --- maloja/database/sqldb.py | 4 ++-- maloja/database_packed.py | 0 maloja/jinjaenv/context.py | 7 +++---- 3 files changed, 5 insertions(+), 6 deletions(-) delete mode 100644 maloja/database_packed.py diff --git a/maloja/database/sqldb.py b/maloja/database/sqldb.py index 3cd77d8..fc4a531 100644 --- a/maloja/database/sqldb.py +++ b/maloja/database/sqldb.py @@ -528,7 +528,7 @@ def get_artists_map(artist_ids,dbconn=None): @cached_wrapper @connection_provider -def get_associated_artists(dbconn=None,*artists): +def get_associated_artists(*artists,dbconn=None): artist_ids = [get_artist_id(a) for a in artists] jointable = sql.join( @@ -547,7 +547,7 @@ def get_associated_artists(dbconn=None,*artists): @cached_wrapper @connection_provider -def get_credited_artists(dbconn=None,*artists): +def get_credited_artists(*artists,dbconn=None): artist_ids = [get_artist_id(a) for a in artists] jointable = sql.join( diff --git a/maloja/database_packed.py b/maloja/database_packed.py deleted file mode 100644 index e69de29..0000000 diff --git a/maloja/jinjaenv/context.py b/maloja/jinjaenv/context.py index ba1b2df..08e38f7 100644 --- a/maloja/jinjaenv/context.py +++ b/maloja/jinjaenv/context.py @@ -1,4 +1,3 @@ -from .. import database_packed from . import filters from ..globalconf import malojaconfig @@ -12,7 +11,7 @@ import math # templating from jinja2 import Environment, PackageLoader, select_autoescape -dbp = jinjaview.JinjaDBConnection() +#dbp = jinjaview.JinjaDBConnection() jinja_environment = Environment( loader=PackageLoader('maloja', "web/jinja"), @@ -26,8 +25,8 @@ def update_jinja_environment(): JINJA_CONTEXT = { # maloja - "db": database, - "dbp":dbp, + "db": database, #TODO: move these to connection manager as well + #"dbp":dbp, "malojatime": malojatime, "utilities": utilities, "mlj_uri": malojauri,