Philipp Hörist pushed to branch master at gajim / gajim
Commits: 3c50f33c by lovetox at 2020-03-20T22:09:06+01:00 Fix pylint errors
- - - - - 6deff74b by lovetox at 2020-03-20T22:15:06+01:00 Remove log_calls() decorator
This generates too much debug output
- - - - -
4 changed files:
- gajim/common/client.py - gajim/common/helpers.py - gajim/plugins/gajimplugin.py - gajim/plugins/pluginmanager.py
Changes:
===================================== gajim/common/client.py ===================================== @@ -52,7 +52,8 @@ class Client(ConnectionHandlers): self._client = None self._account = account self.name = account - self._hostname = app.config.get_per('accounts', self._account, 'hostname') + self._hostname = app.config.get_per( + 'accounts', self._account, 'hostname') self._user = app.config.get_per('accounts', self._account, 'name') self.password = None
@@ -135,7 +136,8 @@ class Client(ConnectionHandlers):
self._client.set_ignored_tls_errors(self._get_ignored_ssl_errors())
- if app.config.get_per('accounts', self._account, 'use_plain_connection'): + if app.config.get_per('accounts', self._account, + 'use_plain_connection'): self._client.set_connection_types([ConnectionType.PLAIN])
proxy = get_user_proxy(self._account) @@ -270,12 +272,12 @@ class Client(ConnectionHandlers): self.get_module('Chatstate').enabled = True self.get_module('MAM').reset_state()
- def _on_stanza_sent(self, _client, signal_name, stanza): + def _on_stanza_sent(self, _client, _signal_name, stanza): app.nec.push_incoming_event(NetworkEvent('stanza-sent', account=self._account, stanza=stanza))
- def _on_stanza_received(self, _client, signal_name, stanza): + def _on_stanza_received(self, _client, _signal_name, stanza): app.nec.push_incoming_event(NetworkEvent('stanza-received', account=self._account, stanza=stanza)) @@ -365,7 +367,7 @@ class Client(ConnectionHandlers): return modules.get(self._account, name)
@helpers.call_counter - def connect_machine(self, restart=False): + def connect_machine(self): log.info('Connect machine state: %s', self._connect_machine_calls) if self._connect_machine_calls == 1: self.get_module('MetaContacts').get_metacontacts() @@ -506,8 +508,8 @@ class Client(ConnectionHandlers): def _abort_reconnect(self): self._set_state(ClientState.DISCONNECTED) self._disable_reconnect_timer() - app.nec.push_incoming_event(OurShowEvent( - None, conn=self, show='offline')) + app.nec.push_incoming_event( + OurShowEvent(None, conn=self, show='offline'))
if self._destroy_client: self._client.destroy()
===================================== gajim/common/helpers.py ===================================== @@ -1289,7 +1289,7 @@ def call_counter(func): if restart: self._connect_machine_calls = 0 self._connect_machine_calls += 1 - return func(self, restart=False) + return func(self) return helper
def get_sync_threshold(jid, archive_info):
===================================== gajim/plugins/gajimplugin.py ===================================== @@ -36,7 +36,7 @@ from gajim.common.types import PluginExtensionPoints # pylint: disable=W0611 from gajim.common.types import EventHandlersDict # pylint: disable=W0611 from gajim.common.types import PluginEvents # pylint: disable=W0611
-from gajim.plugins.helpers import log_calls, log +from gajim.plugins.helpers import log from gajim.plugins.gui import GajimPluginConfigDialog
@@ -161,7 +161,6 @@ class GajimPlugin: subclasses. '''
- @log_calls('GajimPlugin') def __init__(self) -> None: self.config = GajimPluginConfig(self) ''' @@ -177,11 +176,9 @@ class GajimPlugin: self.config_dialog = GajimPluginConfigDialog(self) self.init()
- @log_calls('GajimPlugin') def save_config(self) -> None: self.config.save()
- @log_calls('GajimPlugin') def load_config(self) -> None: self.config.load()
@@ -197,32 +194,26 @@ class GajimPlugin:
return False
- @log_calls('GajimPlugin') def local_file_path(self, file_name): return os.path.join(self.__path__, file_name)
- @log_calls('GajimPlugin') def init(self): pass
- @log_calls('GajimPlugin') def activate(self): pass
- @log_calls('GajimPlugin') def deactivate(self): pass
class GajimPluginConfig(): - @log_calls('GajimPluginConfig') def __init__(self, plugin): self.plugin = plugin self.FILE_PATH = os.path.join( configpaths.get('PLUGINS_CONFIG_DIR'), self.plugin.short_name) self.data = {}
- @log_calls('GajimPluginConfig') def __getitem__(self, key): if not key in self.data: self.data[key] = self.plugin.config_default_values[key][0] @@ -230,17 +221,14 @@ class GajimPluginConfig():
return self.data[key]
- @log_calls('GajimPluginConfig') def __setitem__(self, key, value): self.data[key] = value self.save()
- @log_calls('GajimPluginConfig') def __delitem__(self, key): del self.data[key] self.save()
- @log_calls('GajimPluginConfig') def __contains__(self, key): return key in self.data
@@ -254,13 +242,11 @@ class GajimPluginConfig(): def items(self): return self.data.items()
- @log_calls('GajimPluginConfig') def save(self): fd = open(self.FILE_PATH, 'wb') pickle.dump(self.data, fd) fd.close()
- @log_calls('GajimPluginConfig') def load(self): if os.path.isfile(self.FILE_PATH): fd = open(self.FILE_PATH, 'rb')
===================================== gajim/plugins/pluginmanager.py ===================================== @@ -42,7 +42,7 @@ from gajim.common.exceptions import PluginsystemError from gajim.common.helpers import Singleton from gajim.plugins import plugins_i18n
-from gajim.plugins.helpers import log, log_calls +from gajim.plugins.helpers import log from gajim.plugins.helpers import GajimPluginActivateException from gajim.plugins.gajimplugin import GajimPlugin, GajimPluginException
@@ -75,7 +75,6 @@ class PluginManager(metaclass=Singleton): 'destructors' (classes that register GUI extension points) '''
- #@log_calls('PluginManager') def __init__(self): self.plugins = [] ''' @@ -115,20 +114,17 @@ class PluginManager(metaclass=Singleton): pc = self.scan_dir_for_plugins(path) self.add_plugins(pc)
- @log_calls('PluginManager') def _plugin_has_entry_in_global_config(self, plugin): if app.config.get_per('plugins', plugin.short_name) is None: return False return True
- @log_calls('PluginManager') def _create_plugin_entry_in_global_config(self, plugin): app.config.add_per('plugins', plugin.short_name)
def _remove_plugin_entry_in_global_config(self, plugin): app.config.del_per('plugins', plugin.short_name)
- @log_calls('PluginManager') def update_plugins(self, replace=True, activate=False, plugin_name=None): ''' Move plugins from the downloaded folder to the user plugin folder @@ -171,11 +167,9 @@ class PluginManager(metaclass=Singleton): return updated_plugins
- @log_calls('PluginManager') def init_plugins(self): self._activate_all_plugins_from_global_config()
- @log_calls('PluginManager') def add_plugin(self, plugin_class): ''' :todo: what about adding plug-ins that are already added? Module reload @@ -201,7 +195,6 @@ class PluginManager(metaclass=Singleton): plugin.name, plugin.version, plugin.__module__, plugin.short_name)
- @log_calls('PluginManager') def remove_plugin(self, plugin): ''' removes the plugin from the plugin list and deletes all loaded modules @@ -227,19 +220,16 @@ class PluginManager(metaclass=Singleton): for module_to_remove in modules_to_remove: del sys.modules[module_to_remove]
- @log_calls('PluginManager') def add_plugins(self, plugin_classes): for plugin_class in plugin_classes: self.add_plugin(plugin_class)
- @log_calls('PluginManager') def get_active_plugin(self, plugin_name): for plugin in self.active_plugins: if plugin.short_name == plugin_name: return plugin return None
- @log_calls('PluginManager') def extension_point(self, gui_extpoint_name, *args): ''' Invokes all handlers (from plugins) for a particular extension point, but @@ -259,7 +249,6 @@ class PluginManager(metaclass=Singleton): self._execute_all_handlers_of_gui_extension_point(gui_extpoint_name, *args)
- @log_calls('PluginManager') def gui_extension_point(self, gui_extpoint_name, *args): ''' Invokes all handlers (from plugins) for particular GUI extension point @@ -289,7 +278,6 @@ class PluginManager(metaclass=Singleton): self._execute_all_handlers_of_gui_extension_point(gui_extpoint_name, *args)
- @log_calls('PluginManager') def remove_gui_extension_point(self, gui_extpoint_name, *args): ''' Removes GUI extension point from collection held by `PluginManager`. @@ -339,7 +327,6 @@ class PluginManager(metaclass=Singleton): if disconnect_handler is not None: disconnect_handler(args[0])
- @log_calls('PluginManager') def _add_gui_extension_point_call_to_list(self, gui_extpoint_name, *args): ''' Adds GUI extension point call to list of calls. @@ -365,7 +352,6 @@ class PluginManager(metaclass=Singleton): self.gui_extension_points.setdefault(gui_extpoint_name, []).append( args)
- @log_calls('PluginManager') def _execute_all_handlers_of_gui_extension_point(self, gui_extpoint_name, *args): if gui_extpoint_name in self.gui_extension_points_handlers: @@ -444,7 +430,6 @@ class PluginManager(metaclass=Singleton): handler = handler[:4] con.connection.unregister_handler(*handler)
- @log_calls('PluginManager') def activate_plugin(self, plugin): ''' :param plugin: plugin to be activated @@ -507,7 +492,6 @@ class PluginManager(metaclass=Singleton): for plugin_object in self.active_plugins: self.deactivate_plugin(plugin_object)
- @log_calls('PluginManager') def _add_gui_extension_points_handlers_from_plugin(self, plugin): for gui_extpoint_name, gui_extpoint_handlers in \ plugin.gui_extension_points.items(): @@ -518,7 +502,6 @@ class PluginManager(metaclass=Singleton): if plugin.encryption_name: self.encryption_plugins[plugin.encryption_name] = plugin
- @log_calls('PluginManager') def _handle_all_gui_extension_points_with_plugin(self, plugin): for gui_extpoint_name, gui_extpoint_handlers in \ plugin.gui_extension_points.items(): @@ -534,7 +517,6 @@ class PluginManager(metaclass=Singleton): handler, exc_info=True)
- @log_calls('PluginManager') def _activate_all_plugins(self): ''' Activates all plugins in `plugins`. @@ -580,7 +562,6 @@ class PluginManager(metaclass=Singleton): def _set_plugin_active_in_global_config(self, plugin, active=True): app.config.set_per('plugins', plugin.short_name, 'active', active)
- @log_calls('PluginManager') def scan_dir_for_plugins(self, path, scan_dirs=True, package=False): r''' Scans given directory for plugin classes.
View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/173918c814cf17cd3712418583d5a1cb...
-
Philipp Hörist