Skip to content
Snippets Groups Projects
Commit 04f11fab authored by Julian Rother's avatar Julian Rother
Browse files

Hopefully increased compatibility with older python3 releases

parent a9187585
No related branches found
No related tags found
No related merge requests found
...@@ -103,7 +103,7 @@ def searchquery(text, columns, match, tables, suffix, *suffixparams): ...@@ -103,7 +103,7 @@ def searchquery(text, columns, match, tables, suffix, *suffixparams):
if subexprs == []: if subexprs == []:
return [] return []
expr = 'SELECT *,SUM(_prio) AS _score FROM (%s) AS _tmp %s'%(' UNION '.join(subexprs), suffix) 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]') LDAP_USERRE = re.compile(r'[^a-z0-9]')
if 'LDAP_HOST' in config: if 'LDAP_HOST' in config:
......
...@@ -31,7 +31,7 @@ def sched_func(delay, priority=0, firstdelay=None, args=[], kargs={}): ...@@ -31,7 +31,7 @@ def sched_func(delay, priority=0, firstdelay=None, args=[], kargs={}):
def wrapper(func): def wrapper(func):
def sched_wrapper(): def sched_wrapper():
with app.test_request_context(): with app.test_request_context():
func(*args, *kargs) func(*args, **kargs)
scheduler.enter(delay, priority, sched_wrapper) scheduler.enter(delay, priority, sched_wrapper)
scheduler.enter(firstdelay, priority, sched_wrapper) scheduler.enter(firstdelay, priority, sched_wrapper)
return func return func
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment