diff --git a/gajim/advanced_configuration_window.py b/gajim/advanced_configuration_window.py
index 18ffb5937..f0a58aff2 100644
--- a/gajim/advanced_configuration_window.py
+++ b/gajim/advanced_configuration_window.py
@@ -64,7 +64,7 @@ def tree_model_pre_order(model, treeiter):
yield it
-class AdvancedConfigurationWindow(object):
+class AdvancedConfigurationWindow:
def __init__(self, transient):
self.xml = gtkgui_helpers.get_gtk_builder('advanced_configuration_window.ui')
self.window = self.xml.get_object('advanced_configuration_window')
diff --git a/gajim/command_system/framework.py b/gajim/command_system/framework.py
index 39d12ad0a..8b42235fb 100644
--- a/gajim/command_system/framework.py
+++ b/gajim/command_system/framework.py
@@ -55,7 +55,7 @@ class CommandContainer(metaclass=Container):
"""
__metaclass__ = Container
-class CommandProcessor(object):
+class CommandProcessor:
"""
Command processor is an immediate command emitter. It does not
participate in the dispatching process directly, but must define a
@@ -145,7 +145,7 @@ class CommandProcessor(object):
commands = dict(commands)
return sorted(set(commands.values()), key=lambda k: k.__repr__())
-class Command(object):
+class Command:
def __init__(self, handler, *names, **properties):
self.handler = handler
diff --git a/gajim/common/account.py b/gajim/common/account.py
index 524840eda..032965aa4 100644
--- a/gajim/common/account.py
+++ b/gajim/common/account.py
@@ -15,7 +15,7 @@
# along with Gajim. If not, see .
-class Account(object):
+class Account:
def __init__(self, name, contacts, gc_contacts):
self.name = name
diff --git a/gajim/common/caps_cache.py b/gajim/common/caps_cache.py
index 49fda1836..f3f2fffc0 100644
--- a/gajim/common/caps_cache.py
+++ b/gajim/common/caps_cache.py
@@ -152,7 +152,7 @@ def compute_caps_hash(identities, features, dataforms=None, hash_method='sha-1')
### Internal classes of this module
################################################################################
-class AbstractClientCaps(object):
+class AbstractClientCaps:
"""
Base class representing a client and its capabilities as advertised by a
caps tag in a presence
@@ -282,7 +282,7 @@ class NullClientCaps(AbstractClientCaps):
return False
-class CapsCache(object):
+class CapsCache:
"""
This object keeps the mapping between caps data and real disco features they
represent, and provides simple way to query that info
@@ -295,7 +295,7 @@ class CapsCache(object):
# client (hash method/hash pair)
self.__cache = {}
- class CacheItem(object):
+ class CacheItem:
# __names is a string cache; every string long enough is given
# another object, and we will have plenty of identical long
# strings. therefore we can cache them
diff --git a/gajim/common/contacts.py b/gajim/common/contacts.py
index 6531c0bf6..94703629f 100644
--- a/gajim/common/contacts.py
+++ b/gajim/common/contacts.py
@@ -32,7 +32,7 @@ except ImportError as e:
if __name__ != "__main__":
raise ImportError(str(e))
-class XMPPEntity(object):
+class XMPPEntity:
"""
Base representation of entities in XMPP
"""
diff --git a/gajim/common/file_props.py b/gajim/common/file_props.py
index 9d50eeab9..bc57273e1 100644
--- a/gajim/common/file_props.py
+++ b/gajim/common/file_props.py
@@ -90,7 +90,7 @@ class FilesProp:
del files_props[a, s]
-class FileProp(object):
+class FileProp:
def __init__(self, account, sid):
# Do not instantiate this class directly. Call FilesProp.getNeFileProp
diff --git a/gajim/common/ged.py b/gajim/common/ged.py
index e52e9d1ee..58694a29e 100644
--- a/gajim/common/ged.py
+++ b/gajim/common/ged.py
@@ -52,7 +52,7 @@ OUT_PRECORE = 90
OUT_CORE = 100
OUT_POSTCORE = 110
-class GlobalEventsDispatcher(object):
+class GlobalEventsDispatcher:
def __init__(self):
self.handlers = {}
diff --git a/gajim/common/jingle.py b/gajim/common/jingle.py
index 3212fefe4..d27983c7e 100644
--- a/gajim/common/jingle.py
+++ b/gajim/common/jingle.py
@@ -43,7 +43,7 @@ if app.is_installed('FARSTREAM'):
logger = logging.getLogger('gajim.c.jingle')
-class ConnectionJingle(object):
+class ConnectionJingle:
"""
This object depends on that it is a part of Connection class.
"""
diff --git a/gajim/common/multimedia_helpers.py b/gajim/common/multimedia_helpers.py
index 8a9f649f7..d269fb8bd 100644
--- a/gajim/common/multimedia_helpers.py
+++ b/gajim/common/multimedia_helpers.py
@@ -22,7 +22,7 @@ from gi.repository import Gst
log = logging.getLogger('gajim.c.multimedia_helpers')
-class DeviceManager(object):
+class DeviceManager:
def __init__(self):
self.devices = {}
diff --git a/gajim/common/passwords.py b/gajim/common/passwords.py
index 44a86af72..b1ccd1f6f 100644
--- a/gajim/common/passwords.py
+++ b/gajim/common/passwords.py
@@ -35,7 +35,7 @@ except ImportError:
log.debug('python-keyring missing, falling back to plaintext storage')
-class PasswordStorage(object):
+class PasswordStorage:
"""Interface for password stores"""
def get_password(self, account_name):
"""Return the password for account_name, or None if not found."""
diff --git a/gajim/common/pep.py b/gajim/common/pep.py
index a9d6cc785..837dc701c 100644
--- a/gajim/common/pep.py
+++ b/gajim/common/pep.py
@@ -25,7 +25,7 @@ log = logging.getLogger('gajim.c.pep')
from gajim.common import app
-class AbstractPEP(object):
+class AbstractPEP:
type_ = ''
namespace = ''
diff --git a/gajim/common/socks5.py b/gajim/common/socks5.py
index bcf9a94ef..0063e49b1 100644
--- a/gajim/common/socks5.py
+++ b/gajim/common/socks5.py
@@ -450,7 +450,7 @@ class SocksQueue:
if sock.host != host_to_keep and sock.mode == 'server':
self.remove_sender_by_key(key)
-class Socks5(object):
+class Socks5:
def __init__(self, idlequeue, host, port, initiator, target, sid):
if host is not None:
try:
diff --git a/gajim/config.py b/gajim/config.py
index 041bd797c..c72f1e166 100644
--- a/gajim/config.py
+++ b/gajim/config.py
@@ -294,7 +294,7 @@ class ManageProxiesWindow:
app.config.set_per('proxies', proxy, 'pass', value)
-class FakeDataForm(Gtk.Table, object):
+class FakeDataForm(Gtk.Table):
"""
Class for forms that are in XML format value1 infos in a
table {entry1: value1}
diff --git a/gajim/dataforms_widget.py b/gajim/dataforms_widget.py
index 404d3fa89..bb554d52c 100644
--- a/gajim/dataforms_widget.py
+++ b/gajim/dataforms_widget.py
@@ -36,7 +36,7 @@ from gajim.common import app
import itertools
-class DataFormWidget(Gtk.Alignment, object):
+class DataFormWidget(Gtk.Alignment):
# "public" interface
"""
Data Form widget. Use like any other widget
@@ -306,7 +306,7 @@ class DataFormWidget(Gtk.Alignment, object):
def on_records_selection_changed(self, widget):
self.refresh_multiple_buttons()
-class SingleForm(Gtk.Table, object):
+class SingleForm(Gtk.Table):
"""
Widget that represent DATAFORM_SINGLE mode form. Because this is used not
only to display single forms, but to form input windows of multiple-type
diff --git a/gajim/dialogs.py b/gajim/dialogs.py
index cb2a1b534..3ffc969db 100644
--- a/gajim/dialogs.py
+++ b/gajim/dialogs.py
@@ -1583,7 +1583,7 @@ class ResourceConflictDialog(TimeoutDialog, InputDialog):
-class VoIPCallReceivedDialog(object):
+class VoIPCallReceivedDialog:
instances = {}
def __init__(self, account, contact_jid, sid, content_types):
self.instances[(contact_jid, sid)] = self
diff --git a/gajim/disco.py b/gajim/disco.py
index 60b27d474..0ce636f41 100644
--- a/gajim/disco.py
+++ b/gajim/disco.py
@@ -205,7 +205,7 @@ def get_agent_address(jid, node = None):
else:
return str(jid)
-class Closure(object):
+class Closure:
"""
A weak reference to a callback with arguments as an object
@@ -474,8 +474,7 @@ class ServicesCache:
del self._cbs[cbkey]
-# object is needed so that @property works
-class ServiceDiscoveryWindow(object):
+class ServiceDiscoveryWindow:
"""
Class that represents the Services Discovery window
"""
diff --git a/gajim/message_control.py b/gajim/message_control.py
index 45bbd611e..0b5c673ca 100644
--- a/gajim/message_control.py
+++ b/gajim/message_control.py
@@ -36,7 +36,7 @@ TYPE_PM = 'pm'
####################
-class MessageControl(object):
+class MessageControl:
"""
An abstract base widget that can embed in the Gtk.Notebook of a
MessageWindow
diff --git a/gajim/message_window.py b/gajim/message_window.py
index 971fc5315..7bfd3b72c 100644
--- a/gajim/message_window.py
+++ b/gajim/message_window.py
@@ -41,7 +41,7 @@ from gajim.common.i18n import Q_
####################
-class MessageWindow(object):
+class MessageWindow:
"""
Class for windows which contain message like things; chats, groupchats, etc
"""
diff --git a/gajim/music_track_listener.py b/gajim/music_track_listener.py
index 4d13aec1a..d9efa3d70 100644
--- a/gajim/music_track_listener.py
+++ b/gajim/music_track_listener.py
@@ -29,7 +29,7 @@ log = logging.getLogger('gajim.music_track_listener')
MPRIS_PLAYER_PREFIX = 'org.mpris.MediaPlayer2.'
-class MusicTrackInfo(object):
+class MusicTrackInfo:
__slots__ = ['title', 'album', 'artist', 'duration', 'track_number',
'paused']
diff --git a/gajim/plugins/gajimplugin.py b/gajim/plugins/gajimplugin.py
index 2455101b2..549ea938b 100644
--- a/gajim/plugins/gajimplugin.py
+++ b/gajim/plugins/gajimplugin.py
@@ -33,7 +33,7 @@ import logging
log = logging.getLogger('gajim.p.plugin')
-class GajimPlugin(object):
+class GajimPlugin:
'''
Base class for implementing Gajim plugins.
'''
diff --git a/gajim/plugins/gui.py b/gajim/plugins/gui.py
index 90a3574cb..79165c66d 100644
--- a/gajim/plugins/gui.py
+++ b/gajim/plugins/gui.py
@@ -51,7 +51,7 @@ class Column(IntEnum):
ICON = 4
-class PluginsWindow(object):
+class PluginsWindow:
'''Class for Plugins window'''
@log_calls('PluginsWindow')
diff --git a/gajim/plugins/helpers.py b/gajim/plugins/helpers.py
index ba83047d4..8af201fe4 100644
--- a/gajim/plugins/helpers.py
+++ b/gajim/plugins/helpers.py
@@ -39,7 +39,7 @@ class GajimPluginActivateException(Exception):
'''
pass
-class log_calls(object):
+class log_calls:
'''
Decorator class for functions to easily log when they are entered and left.
'''
diff --git a/gajim/session.py b/gajim/session.py
index 838e047d9..c281cf0fb 100644
--- a/gajim/session.py
+++ b/gajim/session.py
@@ -33,7 +33,7 @@ from gajim.common.const import KindConstant
from gajim.gtk import SingleMessageWindow
-class ChatControlSession(object):
+class ChatControlSession:
def __init__(self, conn, jid, thread_id, type_='chat'):
self.conn = conn
self.jid = jid