From 99efc4a9b4b5dea89d01d232e67a172e2078adbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20H=C3=B6rist?= Date: Tue, 18 Sep 2018 15:24:40 +0200 Subject: [PATCH] Fix pylint errors - consider-using-enumerate - unneeded-not - unidiomatic-typecheck --- gajim/common/connection_handlers.py | 2 +- gajim/common/zeroconf/zeroconf_avahi.py | 4 ++-- gajim/dataforms_widget.py | 4 ++-- gajim/gtk/account_wizard.py | 4 ++-- gajim/gtk/preferences.py | 32 ++++++++++++------------- gajim/gui_interface.py | 2 +- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/gajim/common/connection_handlers.py b/gajim/common/connection_handlers.py index 8746df416..a2c58b88b 100644 --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -371,7 +371,7 @@ class ConnectionHandlersBase: # determine if this session is a pm session # if not, discard the resource so that all sessions are stored bare - if not type_ == 'pm': + if type_ != 'pm': jid = app.get_jid_without_resource(jid) if not jid in self.sessions: diff --git a/gajim/common/zeroconf/zeroconf_avahi.py b/gajim/common/zeroconf/zeroconf_avahi.py index 2caddf87e..d5fd8bb55 100644 --- a/gajim/common/zeroconf/zeroconf_avahi.py +++ b/gajim/common/zeroconf/zeroconf_avahi.py @@ -95,7 +95,7 @@ class Zeroconf: # try to reduce instead of delete first resolved_info = val[Constant.RESOLVED_INFO] if len(resolved_info) > 1: - for i in range(len(resolved_info)): + for i, _info in enumerate(resolved_info): if resolved_info[i][ConstantRI.INTERFACE] == interface and resolved_info[i][ConstantRI.PROTOCOL] == protocol: del self.contacts[key][Constant.RESOLVED_INFO][i] # if still something left, don't remove @@ -180,7 +180,7 @@ class Zeroconf: old_name, old_domain, old_resolved_info, old_bare_name, _old_txt = self.contacts[name] if name == old_name and domain == old_domain and bare_name == old_bare_name: # Seems similar enough, try to merge resolved info: - for i in range(len(old_resolved_info)): + for i, _info in enumerate(old_resolved_info): # for now, keep a single record for each (interface, protocol) pair # # Note that, theoretically, we could both get IPv4 and diff --git a/gajim/dataforms_widget.py b/gajim/dataforms_widget.py index 70bdbc875..c9fc8719e 100644 --- a/gajim/dataforms_widget.py +++ b/gajim/dataforms_widget.py @@ -276,8 +276,8 @@ class DataFormWidget(Gtk.Alignment): selection = self.records_treeview.get_selection() model, rowrefs = selection.get_selected_rows() # rowref is a list of paths - for i in range(len(rowrefs)): - rowrefs[i] = Gtk.TreeRowReference.new(model, rowrefs[i]) + for index, _path in enumerate(rowrefs): + rowrefs[index] = Gtk.TreeRowReference.new(model, rowrefs[index]) # rowref is a list of row references; need to convert because we will # modify the model, paths would change for rowref in rowrefs: diff --git a/gajim/gtk/account_wizard.py b/gajim/gtk/account_wizard.py index 5756e6621..4153dceb3 100644 --- a/gajim/gtk/account_wizard.py +++ b/gajim/gtk/account_wizard.py @@ -339,8 +339,8 @@ class AccountCreationWizard: proxies_combobox.set_model(model) proxies = app.config.get_per('proxies') proxies.insert(0, _('None')) - for i in range(len(proxies)): - model.append([proxies[i]]) + for proxy in proxies: + model.append([proxy]) proxies_combobox.set_active(0) def on_manage_proxies_button_clicked(self, widget): diff --git a/gajim/gtk/preferences.py b/gajim/gtk/preferences.py index 5687725b1..d2407ad2f 100644 --- a/gajim/gtk/preferences.py +++ b/gajim/gtk/preferences.py @@ -179,28 +179,28 @@ class Preferences(Gtk.ApplicationWindow): self.iconset_combobox.add_attribute(renderer_text, 'text', 1) self.iconset_combobox.add_attribute(renderer_image, 'image', 0) self.iconset_combobox.set_model(model) - l = [] + dirlist = [] for dir_ in iconsets_list: if not os.path.isdir(os.path.join(configpaths.get('DATA'), 'iconsets', dir_)) \ and not os.path.isdir(os.path.join(configpaths.get('MY_ICONSETS'), dir_)): continue if dir_ not in ('.svn', 'transports'): - l.append(dir_) - if l.count == 0: - l.append(' ') - for i in range(len(l)): + dirlist.append(dir_) + if not dirlist: + dirlist.append(' ') + for index, dir_ in enumerate(dirlist): preview = Gtk.Image() files = [] - files.append(os.path.join(helpers.get_iconset_path(l[i]), '16x16', + files.append(os.path.join(helpers.get_iconset_path(dir_), '16x16', 'online.png')) - files.append(os.path.join(helpers.get_iconset_path(l[i]), '16x16', + files.append(os.path.join(helpers.get_iconset_path(dir_), '16x16', 'online.gif')) for file_ in files: if os.path.exists(file_): preview.set_from_file(file_) - model.append([preview, l[i]]) - if app.config.get('iconset') == l[i]: - self.iconset_combobox.set_active(i) + model.append([preview, dir_]) + if app.config.get('iconset') == dir_: + self.iconset_combobox.set_active(index) # Use transports iconsets st = app.config.get('use_transports_iconsets') @@ -985,12 +985,12 @@ class Preferences(Gtk.ApplicationWindow): proxy_combobox = self.xml.get_object('proxies_combobox') model = proxy_combobox.get_model() model.clear() - l = app.config.get_per('proxies') - l.insert(0, _('None')) - for i in range(len(l)): - model.append([l[i]]) - if our_proxy == l[i]: - proxy_combobox.set_active(i) + proxies = app.config.get_per('proxies') + proxies.insert(0, _('None')) + for index, proxy in enumerate(proxies): + model.append([proxy]) + if our_proxy == proxy: + proxy_combobox.set_active(index) def on_open_advanced_editor_button_clicked(self, widget, data=None): if 'advanced_config' in app.interface.instances: diff --git a/gajim/gui_interface.py b/gajim/gui_interface.py index f6f7be932..8abc3bbb1 100644 --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -1568,7 +1568,7 @@ class Interface: for event_name, event_handlers in self.handlers.items(): for event_handler in event_handlers: prio = ged.GUI1 - if type(event_handler) == tuple: + if isinstance(event_handler, tuple): prio = event_handler[1] event_handler = event_handler[0] app.ged.register_event_handler(event_name, prio,