diff --git a/db.py b/db.py index 2d6dddddc5f0611103ae5f4e7b0e4c62c3346209..bdbfb7b93ff1becb01b5e32d8f630d506ac3a8d6 100644 --- a/db.py +++ b/db.py @@ -103,7 +103,7 @@ def searchquery(text, columns, match, tables, suffix, *suffixparams): if subexprs == []: return [] expr = 'SELECT *,SUM(_prio) AS _score FROM (%s) AS _tmp %s'%(' UNION '.join(subexprs), suffix) - return query(expr, *params, *suffixparams) + return query(expr, *(list(params)+list(suffixparams))) LDAP_USERRE = re.compile(r'[^a-z0-9]') if 'LDAP_HOST' in config: diff --git a/server.py b/server.py index b835e097fd30581a028ec4c20e39d044df4cd1cf..39c0748fb307d44437cdc62fb4c66a1ab8836697 100644 --- a/server.py +++ b/server.py @@ -31,7 +31,7 @@ def sched_func(delay, priority=0, firstdelay=None, args=[], kargs={}): def wrapper(func): def sched_wrapper(): with app.test_request_context(): - func(*args, *kargs) + func(*args, **kargs) scheduler.enter(delay, priority, sched_wrapper) scheduler.enter(firstdelay, priority, sched_wrapper) return func