diff options
Diffstat (limited to 'quarg/main.py')
| -rw-r--r-- | quarg/main.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/quarg/main.py b/quarg/main.py index 9fde869..6e14ab6 100644 --- a/quarg/main.py +++ b/quarg/main.py @@ -13,7 +13,6 @@ import quarg.quassel.formatter as formatter from quarg.database.tables import Backlog, Buffer, Network, QuasselUser, Sender from quarg.utils import errx -# pylint: disable=line-too-long cli = argparse.ArgumentParser() cli.add_argument('keyword', nargs='*', help='match messages containing this keyword') cli.add_argument('-d', action='store_true', dest='debug', help='print debug and SQL query information') @@ -37,7 +36,6 @@ date_matchers.add_argument('--around', action=actions.ParseAround, metavar='DATE joined_group = matchers.add_mutually_exclusive_group() joined_group.add_argument('--joined', default=None, action='store_true', dest='joined', help='match buffers which are currently joined') joined_group.add_argument('--no-joined', default=None, action='store_false', dest='joined', help='match buffers which are not currently joined') -# pylint: enable=line-too-long Session = sessionmaker() @@ -60,7 +58,7 @@ def check_args(args): def collect_predicates(args): funs = { - 'keyword': filters.msg_like if args.expr else filters.msg_contains, + 'keyword': filters.msg_like if args.expr else filters.msg_contains, 'buffer': filters.buffer, 'nick': filters.nick, 'after': filters.time_after, @@ -128,8 +126,8 @@ def main(): if not config.has_option('Database', 'url'): errx('No database URL set in config file.') - engine = create_engine(config.get('Database', 'url'), echo=args.debug) - session = Session(bind=engine) + engine = create_engine(config.get('Database', 'url'), echo=args.debug, future=True) + session = Session(bind=engine, future=True) predicates = list(collect_predicates(args)) |