GitLab

at 2017-08-02T18:57:02+02:00

Stay compatible to python 3.4

Fixes #8690

 

         try:

             messages = self.con.execute(

-                sql, (*jids, restore, pending)).fetchall()

+                sql, tuple(jids) + (restore, pending)).fetchall()

         except sqlite.DatabaseError:

             self.dispatch('DB_ERROR',

                           exceptions.DatabaseMalformed(LOG_DB_PATH))

             ORDER BY time, log_line_id

             '''.format(jids=', '.join('?' * len(jids)))

 

-        return self.con.execute(sql, (*jids, 

-                                      date.timestamp(),

+        return self.con.execute(sql, tuple(jids) +

+                                      (date.timestamp(),

                                       (date + delta).timestamp())).fetchall()

 

     def search_log(self, account, jid, query, date=None):

         '''.format(jids=', '.join('?' * len(jids)),

                    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):

         """

             """.format(jids=', '.join('?' * len(jids)),

                        kinds=', '.join(kinds))

 

-        return self.con.execute(sql, (*jids,

-                                      date.timestamp(),

+        return self.con.execute(sql, tuple(jids) +

+                                      (date.timestamp(),

                                       (date + delta).timestamp())).fetchall()

 

     def get_last_date_that_has_logs(self, account, jid):

 

         # fetchone() returns always at least one Row with all

         # 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):

         """

               '''.format(columns=', '.join(kwargs.keys()),

                          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:

             sql = '''INSERT INTO unread_messages (message_id, jid_id)

 import logging

 import importlib.util as imp

 from collections import OrderedDict

+from importlib.machinery import SourceFileLoader

 

 from gi.repository import GdkPixbuf, Gtk, GLib

 

         module_name = 'emoticons_theme.pyc'

         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:

-        theme = imp.module_from_spec(spec)

-        spec.loader.exec_module(theme)

+        theme = loader.load_module()

     except FileNotFoundError:

         log.exception('Emoticons theme not found')

         return

Philipp Hörist pushed to branch master at gajim / gajim

Commits:

2 changed files:

Changes: