Cleanup

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(

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,