Stay compatible to python 3.4

Fixes #8690
This commit is contained in:
Philipp Hörist 2017-08-02 18:56:25 +02:00
parent bc7ce12932
commit 6f3c21118f
2 changed files with 11 additions and 11 deletions

View file

@ -676,7 +676,7 @@ class Logger:
try: try:
messages = self.con.execute( messages = self.con.execute(
sql, (*jids, restore, pending)).fetchall() sql, tuple(jids) + (restore, pending)).fetchall()
except sqlite.DatabaseError: except sqlite.DatabaseError:
self.dispatch('DB_ERROR', self.dispatch('DB_ERROR',
exceptions.DatabaseMalformed(LOG_DB_PATH)) exceptions.DatabaseMalformed(LOG_DB_PATH))
@ -722,8 +722,8 @@ class Logger:
ORDER BY time, log_line_id ORDER BY time, log_line_id
'''.format(jids=', '.join('?' * len(jids))) '''.format(jids=', '.join('?' * len(jids)))
return self.con.execute(sql, (*jids, return self.con.execute(sql, tuple(jids) +
date.timestamp(), (date.timestamp(),
(date + delta).timestamp())).fetchall() (date + delta).timestamp())).fetchall()
def search_log(self, account, jid, query, date=None): def search_log(self, account, jid, query, date=None):
@ -765,7 +765,7 @@ class Logger:
'''.format(jids=', '.join('?' * len(jids)), '''.format(jids=', '.join('?' * len(jids)),
date_search=between if date else '') date_search=between if date else '')
return self.con.execute(sql, (*jids, query)).fetchall() return self.con.execute(sql, tuple(jids) + (query,)).fetchall()
def get_days_with_logs(self, account, jid, year, month): def get_days_with_logs(self, account, jid, year, month):
""" """
@ -803,8 +803,8 @@ class Logger:
""".format(jids=', '.join('?' * len(jids)), """.format(jids=', '.join('?' * len(jids)),
kinds=', '.join(kinds)) kinds=', '.join(kinds))
return self.con.execute(sql, (*jids, return self.con.execute(sql, tuple(jids) +
date.timestamp(), (date.timestamp(),
(date + delta).timestamp())).fetchall() (date + delta).timestamp())).fetchall()
def get_last_date_that_has_logs(self, account, jid): def get_last_date_that_has_logs(self, account, jid):
@ -831,7 +831,7 @@ class Logger:
# fetchone() returns always at least one Row with all # fetchone() returns always at least one Row with all
# attributes set to None because of the MAX() function # attributes set to None because of the MAX() function
return self.con.execute(sql, (*jids,)).fetchone().time return self.con.execute(sql, tuple(jids)).fetchone().time
def get_room_last_message_time(self, account, jid): def get_room_last_message_time(self, account, jid):
""" """
@ -1210,7 +1210,7 @@ class Logger:
'''.format(columns=', '.join(kwargs.keys()), '''.format(columns=', '.join(kwargs.keys()),
values=', '.join('?' * len(kwargs))) values=', '.join('?' * len(kwargs)))
lastrowid = self.con.execute(sql, (jid, time_, kind, *kwargs.values())).lastrowid lastrowid = self.con.execute(sql, (jid, time_, kind) + tuple(kwargs.values())).lastrowid
if unread and kind == KindConstant.CHAT_MSG_RECV: if unread and kind == KindConstant.CHAT_MSG_RECV:
sql = '''INSERT INTO unread_messages (message_id, jid_id) sql = '''INSERT INTO unread_messages (message_id, jid_id)

View file

@ -20,6 +20,7 @@ import sys
import logging import logging
import importlib.util as imp import importlib.util as imp
from collections import OrderedDict from collections import OrderedDict
from importlib.machinery import SourceFileLoader
from gi.repository import GdkPixbuf, Gtk, GLib from gi.repository import GdkPixbuf, Gtk, GLib
@ -65,10 +66,9 @@ def load(path):
module_name = 'emoticons_theme.pyc' module_name = 'emoticons_theme.pyc'
theme_path = os.path.join(path, module_name) theme_path = os.path.join(path, module_name)
spec = imp.spec_from_file_location(module_name, theme_path) loader = SourceFileLoader(module_name, theme_path)
try: try:
theme = imp.module_from_spec(spec) theme = loader.load_module()
spec.loader.exec_module(theme)
except FileNotFoundError: except FileNotFoundError:
log.exception('Emoticons theme not found') log.exception('Emoticons theme not found')
return return