Commits September 2018

commits@gajim.org

1 participants
100 discussions

[Git][gajim/gajim][master] Remote control: Better handle unknown types
by Philipp Hörist 18 Sep '18

18 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: c7c74998 by André Apitzsch at 2018-09-18T20:23:58Z Remote control: Better handle unknown types there is no corresponding GLib.Variant for None, use conversion to string as workaround - - - - - 1 changed file: - gajim/remote_control.py Changes: ===================================== gajim/remote_control.py ===================================== --- a/gajim/remote_control.py +++ b/gajim/remote_control.py @@ -62,7 +62,7 @@ def get_dbus_struct(obj): result.insert_value(key, get_dbus_struct(value)) return result.end() # unknown type - return None + return GLib.Variant('s', str(obj)) class Server: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c7c74998f23dae88479e46bd02ce8ee677… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c7c74998f23dae88479e46bd02ce8ee677… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Fix undefined-loop-variable pylint error
by Philipp Hörist 18 Sep '18

18 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5b23d487 by Philipp Hörist at 2018-09-18T17:02:48Z Fix undefined-loop-variable pylint error - - - - - 46ed4757 by Philipp Hörist at 2018-09-18T17:03:14Z Update pre-push-tests.sh - - - - - 2 changed files: - gajim/htmltextview.py - scripts/dev/pre-push-tests.sh Changes: ===================================== gajim/htmltextview.py ===================================== --- a/gajim/htmltextview.py +++ b/gajim/htmltextview.py @@ -498,7 +498,7 @@ class HtmlHandler(xml.sax.handler.ContentHandler): log.warning('Style attribute "%s" not yet implemented', style) else: __style_methods[style] = method - del style + del style # pylint: disable=undefined-loop-variable # -- def _get_style_tags(self): ===================================== scripts/dev/pre-push-tests.sh ===================================== --- a/scripts/dev/pre-push-tests.sh +++ b/scripts/dev/pre-push-tests.sh @@ -12,5 +12,27 @@ pylint --jobs=2 --disable=C0103,C0302,C0330,C0411,C0412,C0413,E0203,E0401,E0611, # E0611 no-name-in-module # E0710 raising-non-exception - GLib.GError is not recognized # E0712 catching-non-exception - GLib.GError is not recognized +# E1101 no-member +# E1102 not-callable +# E1128 assignment-from-none +# E1133 not-an-iterable +# E1136 unsubscriptable-object # R0201 no-self-use -# W0143 comparison-with-callable - Dont add to Server CI, only available on pylint 2.0+ \ No newline at end of file +# R0901 too-many-ancestors +# R0904 too-many-public-methods +# R0913 too-many-arguments +# R0916 too-many-boolean-expressions +# R1702 +# R1706 +# R1711 +# R1716 +# W0143 comparison-with-callable - Dont add to Server CI, only available on pylint 2.0+ +# W0201 attribute-defined-outside-init +# W0212 protected-access +# W0221 arguments-differ +# W0223 abstract-method +# W0311 bad-indentation +# W0401 wildcard-import +# W0603 global-statement +# W0613 unused-argument +# W0614 unused-wildcard-import \ No newline at end of file View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/7fcd85f0266727556b474298abd84145b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/7fcd85f0266727556b474298abd84145b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Fix pylint errors
by Philipp Hörist 18 Sep '18

18 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 422cd129 by Philipp Hörist at 2018-09-18T16:45:16Z Fix pylint errors - deprecated-method - anomalous-backslash-in-string - cell-var-from-loop - undefined-loop-variable - - - - - 7fcd85f0 by Philipp Hörist at 2018-09-18T16:53:13Z Update pylint error list - Check for W0631 undefined-loop-variable - Check for W0640 cell-var-from-loop - Check for W1401 anomalous-backslash-in-string - Check for W1505 deprecated-method - - - - - 8 changed files: - .gitlab-ci.yml - gajim/command_system/framework.py - gajim/common/config.py - gajim/common/optparser.py - gajim/common/zeroconf/zeroconf_bonjour.py - gajim/dataforms_widget.py - gajim/dialogs.py - scripts/dev/pre-push-tests.sh Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,7 +19,7 @@ run-mypy: run-pylint: stage: test script: - - pylint3 --jobs=2 --disable=C0103,C0302,C0330,C0411,C0412,C0413,E0203,E0401,E0611,E0710,E0712,E1101,E1102,E1128,E1133,E1136,R0201,R0901,R0904,R0913,R0916,R1702,R1706,R1711,R1716,W0201,W0212,W0221,W0223,W0311,W0401,W0603,W0613,W0614,W0631,W0640,W1401,W1505 gajim + - pylint3 --jobs=2 --disable=C0103,C0302,C0330,C0411,C0412,C0413,E0203,E0401,E0611,E0710,E0712,E1101,E1102,E1128,E1133,E1136,R0201,R0901,R0904,R0913,R0916,R1702,R1706,R1711,R1716,W0201,W0212,W0221,W0223,W0311,W0401,W0603,W0613,W0614 gajim run-build: stage: build ===================================== gajim/command_system/framework.py ===================================== --- a/gajim/command_system/framework.py +++ b/gajim/command_system/framework.py @@ -215,7 +215,7 @@ class Command: Extract handler's arguments specification, as it was defined preserving their order. """ - names, var_args, var_kwargs, defaults = getargspec(self.handler) + names, var_args, var_kwargs, defaults = getargspec(self.handler) # pylint: disable=W1505 # Behavior of this code need to be checked. Might yield # incorrect results on some rare occasions. ===================================== gajim/common/config.py ===================================== --- a/gajim/common/config.py +++ b/gajim/common/config.py @@ -48,7 +48,7 @@ class Option(IntEnum): opt_int = ['integer', 0] opt_str = ['string', 0] opt_bool = ['boolean', 0] -opt_color = ['color', '^(#[0-9a-fA-F]{6})|()|rgb$\d+,\d+,\d+$|rgba$\d+,\d+,\d+,[01]\.?\d*$$'] +opt_color = ['color', r'(#[0-9a-fA-F]{6})|rgb$\d+,\d+,\d+$|rgba$\d+,\d+,\d+,[01]\.?\d*$'] opt_one_window_types = ['never', 'always', 'always_with_roster', 'peracct', 'pertype'] opt_show_roster_on_startup = ['always', 'never', 'last_state'] opt_treat_incoming_messages = ['', 'chat', 'normal'] ===================================== gajim/common/optparser.py ===================================== --- a/gajim/common/optparser.py +++ b/gajim/common/optparser.py @@ -59,7 +59,7 @@ class OptionsParser: for line in fd: match = regex.match(line) if match is None: - log.warn('Invalid configuration line, ignoring it: %s', line) + log.warning('Invalid configuration line, ignoring it: %s', line) continue optname, key, subname, value = match.groups() if key is None: ===================================== gajim/common/zeroconf/zeroconf_bonjour.py ===================================== --- a/gajim/common/zeroconf/zeroconf_bonjour.py +++ b/gajim/common/zeroconf/zeroconf_bonjour.py @@ -121,7 +121,7 @@ class Zeroconf: } # Split on '.' but do not split on '\.' - result = re.split('(?<!\\\\)\.', fullname) + result = re.split(r'(?<!\\\\)\.', fullname) name = result[0] protocol, domain = result[2:4] ===================================== gajim/dataforms_widget.py ===================================== --- a/gajim/dataforms_widget.py +++ b/gajim/dataforms_widget.py @@ -428,12 +428,12 @@ class SingleForm(Gtk.Table): widget.set_sensitive(readwrite) else: # more than 5 options: show combobox - def on_list_multi_treeview_changed(selection, f): - def for_selected(treemodel, path, iter_): + def on_list_multi_treeview_changed(selection, field_): + def for_selected(treemodel, _path, iter_): vals.append(treemodel[iter_][1]) vals = [] selection.selected_foreach(for_selected) - field.values = vals[:] + field_.values = vals[:] widget = Gtk.ScrolledWindow() widget.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC) tv = gtkgui_helpers.create_list_multi(field.options, ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -104,6 +104,7 @@ class EditGroupsDialog: account, [group]) # FIXME: Ugly workaround. + # pylint: disable=undefined-loop-variable app.interface.roster.draw_group(_('General'), account) def add_group(self, group): @@ -116,6 +117,7 @@ class EditGroupsDialog: # FIXME: Ugly workaround. # Maybe we haven't been in any group (defaults to General) + # pylint: disable=undefined-loop-variable app.interface.roster.draw_group(_('General'), account) def on_add_button_clicked(self, widget): @@ -1692,17 +1694,15 @@ class VoIPCallReceivedDialog: out_xid = ctrl.xml.get_object('outgoing_drawingarea').\ get_property('window').get_xid() b = content.src_bin - found = False for e in b.children: - if e.get_name().startswith('autovideosink'): - found = True - break - if found: + if not e.get_name().startswith('autovideosink'): + continue for f in e.children: if f.get_name().startswith('autovideosink'): f.set_window_handle(out_xid) content.out_xid = out_xid break + break content.in_xid = in_xid ctrl.set_video_state('connecting', self.sid) # Now, accept the content/sessions. ===================================== scripts/dev/pre-push-tests.sh ===================================== --- a/scripts/dev/pre-push-tests.sh +++ b/scripts/dev/pre-push-tests.sh @@ -1,5 +1,5 @@ mypy -p gajim.common.modules --follow-imports=skip -pylint --jobs=2 --disable=C0103,C0302,C0330,C0411,C0412,C0413,E0203,E0401,E0611,E0710,E0712,E1101,E1102,E1128,E1133,E1136,R0201,R0901,R0904,R0913,R0916,R1702,R1706,R1711,R1716,W0201,W0212,W0221,W0223,W0311,W0401,W0603,W0613,W0614,W0631,W0640,W1401,W1505 gajim +pylint --jobs=2 --disable=C0103,C0302,C0330,C0411,C0412,C0413,E0203,E0401,E0611,E0710,E0712,E1101,E1102,E1128,E1133,E1136,R0201,R0901,R0904,R0913,R0916,R1702,R1706,R1711,R1716,W0143,W0201,W0212,W0221,W0223,W0311,W0401,W0603,W0613,W0614 gajim # C0103 invalid-name # C0302 too-many-lines @@ -10,6 +10,7 @@ pylint --jobs=2 --disable=C0103,C0302,C0330,C0411,C0412,C0413,E0203,E0401,E0611, # E0203 access-member-before-definition # E0401 import-error # E0611 no-name-in-module -# E0710 raising-non-exception - GLIB -# E0712 catching-non-exception - GLIB -# R0201 no-self-use \ No newline at end of file +# E0710 raising-non-exception - GLib.GError is not recognized +# E0712 catching-non-exception - GLib.GError is not recognized +# R0201 no-self-use +# W0143 comparison-with-callable - Dont add to Server CI, only available on pylint 2.0+ \ No newline at end of file View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/6c80473ebe645e38c38b10a3d67d008f2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/6c80473ebe645e38c38b10a3d67d008f2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] pylint W0143 is not available on pylint < 2.0
by Philipp Hörist 18 Sep '18

18 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6c80473e by Philipp Hörist at 2018-09-18T15:39:35Z pylint W0143 is not available on pylint < 2.0 - - - - - 2 changed files: - gajim/common/connection.py - gajim/gui_menu_builder.py Changes: ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -1031,7 +1031,7 @@ class Connection(CommonConnection, ConnectionHandlers): nbxmpp.dispatcher_nb.DEFAULT_TIMEOUT_SECONDS = \ self.try_connecting_for_foo_secs # FIXME: this is a hack; need a better way - if self.on_connect_success == self._on_new_account: # pylint: disable=W0143 + if self.on_connect_success == self._on_new_account: con.RegisterDisconnectHandler(self._on_new_account) if self.client_cert and app.config.get_per('accounts', self.name, ===================================== gajim/gui_menu_builder.py ===================================== --- a/gajim/gui_menu_builder.py +++ b/gajim/gui_menu_builder.py @@ -41,7 +41,6 @@ def build_resources_submenu(contacts, account, action, room_jid=None, item = Gtk.MenuItem.new_with_label( '%s (%s)' % (c.resource, str(c.priority))) sub_menu.append(item) - # pylint: disable=W0143 if action == roster.on_invite_to_room: item.connect('activate', action, [(c, account)], room_jid, room_account, c.resource) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6c80473ebe645e38c38b10a3d67d008f27… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6c80473ebe645e38c38b10a3d67d008f27… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Fix pylint errors
by Philipp Hörist 18 Sep '18

18 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 385ef2e4 by Philipp Hörist at 2018-09-18T15:02:14Z Fix pylint errors - duplicate-key - eval-used - comparison-with-callable - - - - - 803ff3de by Philipp Hörist at 2018-09-18T15:21:53Z Update pylint error list - Check for W0109 duplicate-key - Check for W0123 eval-used - Check for W0143 comparison-with-callable - - - - - 6 changed files: - .gitlab-ci.yml - gajim/common/connection.py - gajim/gui_interface.py - gajim/gui_menu_builder.py - gajim/htmltextview.py - scripts/dev/pre-push-tests.sh Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,7 +19,7 @@ run-mypy: run-pylint: stage: test script: - - pylint3 --jobs=2 --disable=C0103,C0302,C0330,C0411,C0412,C0413,E0203,E0401,E0611,E0710,E0712,E1101,E1102,E1128,E1133,E1136,R0201,R0901,R0904,R0913,R0916,R1702,R1706,R1711,R1716,W0109,W0123,W0143,W0201,W0212,W0221,W0223,W0311,W0401,W0603,W0613,W0614,W0631,W0640,W1401,W1505 gajim + - pylint3 --jobs=2 --disable=C0103,C0302,C0330,C0411,C0412,C0413,E0203,E0401,E0611,E0710,E0712,E1101,E1102,E1128,E1133,E1136,R0201,R0901,R0904,R0913,R0916,R1702,R1706,R1711,R1716,W0201,W0212,W0221,W0223,W0311,W0401,W0603,W0613,W0614,W0631,W0640,W1401,W1505 gajim run-build: stage: build ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -1031,7 +1031,7 @@ class Connection(CommonConnection, ConnectionHandlers): nbxmpp.dispatcher_nb.DEFAULT_TIMEOUT_SECONDS = \ self.try_connecting_for_foo_secs # FIXME: this is a hack; need a better way - if self.on_connect_success == self._on_new_account: + if self.on_connect_success == self._on_new_account: # pylint: disable=W0143 con.RegisterDisconnectHandler(self._on_new_account) if self.client_cert and app.config.get_per('accounts', self.name, ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -1873,18 +1873,19 @@ class Interface: ################################################################################ def join_gc_room(self, account, room_jid, nick, password, minimize=False, - is_continued=False): + is_continued=False): """ Join the room immediately """ if app.contacts.get_contact(account, room_jid) and \ not app.contacts.get_contact(account, room_jid).is_groupchat(): - ErrorDialog(_('This is not a group chat'), + ErrorDialog( + _('This is not a group chat'), _('%(room_jid)s is already in your roster. Please check ' - 'if %(room_jid)s is a correct group chat name. If it is, ' - 'delete it from your roster and try joining the group chat ' - 'again.') % {'room_jid': room_jid, 'room_jid': room_jid}) + 'if %(room_jid)s is a correct group chat name. If it is, ' + 'delete it from your roster and try joining the group chat ' + 'again.') % {'room_jid': room_jid}) return if not nick: ===================================== gajim/gui_menu_builder.py ===================================== --- a/gajim/gui_menu_builder.py +++ b/gajim/gui_menu_builder.py @@ -41,7 +41,7 @@ def build_resources_submenu(contacts, account, action, room_jid=None, item = Gtk.MenuItem.new_with_label( '%s (%s)' % (c.resource, str(c.priority))) sub_menu.append(item) - + # pylint: disable=W0143 if action == roster.on_invite_to_room: item.connect('activate', action, [(c, account)], room_jid, room_account, c.resource) ===================================== gajim/htmltextview.py ===================================== --- a/gajim/htmltextview.py +++ b/gajim/htmltextview.py @@ -183,7 +183,7 @@ INLINE = INLINE_PHRASAL.union(INLINE_PRES).union(INLINE_STRUCT) LIST_ELEMS = set('dl, ol, ul'.split(', ')) for _name in BLOCK_HEAD: - _num = eval(_name[1]) + _num = int(_name[1]) _header_size = (_num - 1) // 2 _weight = (_num - 1) % 2 _element_styles[_name] = '; font-size: %s; %s' % (('large', 'medium', 'small')[_header_size], ===================================== scripts/dev/pre-push-tests.sh ===================================== --- a/scripts/dev/pre-push-tests.sh +++ b/scripts/dev/pre-push-tests.sh @@ -1,5 +1,5 @@ mypy -p gajim.common.modules --follow-imports=skip -pylint --jobs=2 --disable=C0103,C0302,C0330,C0411,C0412,C0413,E0203,E0401,E0611,E0710,E0712,E1101,E1102,E1128,E1133,E1136,R0201,R0901,R0904,R0913,R0916,R1702,R1706,R1711,R1716,W0109,W0123,W0143,W0201,W0212,W0221,W0223,W0311,W0401,W0603,W0613,W0614,W0631,W0640,W1401,W1505 gajim +pylint --jobs=2 --disable=C0103,C0302,C0330,C0411,C0412,C0413,E0203,E0401,E0611,E0710,E0712,E1101,E1102,E1128,E1133,E1136,R0201,R0901,R0904,R0913,R0916,R1702,R1706,R1711,R1716,W0201,W0212,W0221,W0223,W0311,W0401,W0603,W0613,W0614,W0631,W0640,W1401,W1505 gajim # C0103 invalid-name # C0302 too-many-lines View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/457faf38067537735acdaa8b67a4c22ef… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/457faf38067537735acdaa8b67a4c22ef… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Fix pylint errors
by Philipp Hörist 18 Sep '18

18 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 81387ada by Philipp Hörist at 2018-09-18T14:44:23Z Fix pylint errors - pointless-statement - pointless-string-statement - unnecessary-lambda - - - - - 457faf38 by Philipp Hörist at 2018-09-18T14:46:20Z Update pylint error list - Check for W0104 pointless-statement - Check for W0105 pointless-string-statement - Check for W0108 unnecessary-lambda - - - - - 6 changed files: - .gitlab-ci.yml - gajim/common/app.py - gajim/filetransfers_window.py - gajim/gtk/profile.py - gajim/gui_menu_builder.py - scripts/dev/pre-push-tests.sh Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,7 +19,7 @@ run-mypy: run-pylint: stage: test script: - - pylint3 --jobs=2 --disable=C0103,C0302,C0330,C0411,C0412,C0413,E0203,E0401,E0611,E0710,E0712,E1101,E1102,E1128,E1133,E1136,R0201,R0901,R0904,R0913,R0916,R1702,R1706,R1711,R1716,W0104,W0105,W0108,W0109,W0123,W0143,W0201,W0212,W0221,W0223,W0311,W0401,W0603,W0613,W0614,W0631,W0640,W1401,W1505 gajim + - pylint3 --jobs=2 --disable=C0103,C0302,C0330,C0411,C0412,C0413,E0203,E0401,E0611,E0710,E0712,E1101,E1102,E1128,E1133,E1136,R0201,R0901,R0904,R0913,R0916,R1702,R1706,R1711,R1716,W0109,W0123,W0143,W0201,W0212,W0221,W0223,W0311,W0401,W0603,W0613,W0614,W0631,W0640,W1401,W1505 gajim run-build: stage: build ===================================== gajim/common/app.py ===================================== --- a/gajim/common/app.py +++ b/gajim/common/app.py @@ -188,14 +188,12 @@ def detect_dependencies(): # python-gnupg try: import gnupg - ''' - We need https://pypi.python.org/pypi/python-gnupg - but https://pypi.python.org/pypi/gnupg shares the same package name. - It cannot be used as a drop-in replacement. - We test with a version check if python-gnupg is installed as it is - on a much lower version number than gnupg - Also we need at least python-gnupg 0.3.8 - ''' + # We need https://pypi.python.org/pypi/python-gnupg + # but https://pypi.python.org/pypi/gnupg shares the same package name. + # It cannot be used as a drop-in replacement. + # We test with a version check if python-gnupg is installed as it is + # on a much lower version number than gnupg + # Also we need at least python-gnupg 0.3.8 v_gnupg = gnupg.__version__ if V(v_gnupg) < V('0.3.8') or V(v_gnupg) > V('1.0.0'): log('gajim').info('Gajim needs python-gnupg >= 0.3.8') ===================================== gajim/filetransfers_window.py ===================================== --- a/gajim/filetransfers_window.py +++ b/gajim/filetransfers_window.py @@ -466,7 +466,7 @@ class FileTransfersWindow: iter_ = self.get_iter_by_sid(file_props.type_, file_props.sid) if iter_ is None: return - self.model[iter_][Column.SID] + if status == 'stop': file_props.stopped = True elif status == 'ok': ===================================== gajim/gtk/profile.py ===================================== --- a/gajim/gtk/profile.py +++ b/gajim/gtk/profile.py @@ -185,7 +185,7 @@ class ProfileWindow(Gtk.ApplicationWindow): pritext, _('Format of the date must be YYYY-MM-DD'), transient_for=self) - GLib.idle_add(lambda: widget.grab_focus()) + GLib.idle_add(widget.grab_focus) return True def set_value(self, entry_name, value): ===================================== gajim/gui_menu_builder.py ===================================== --- a/gajim/gui_menu_builder.py +++ b/gajim/gui_menu_builder.py @@ -594,10 +594,6 @@ def get_transport_menu(contact, account): menu.show_all() return menu -''' -Build dynamic Application Menus -''' - def get_singlechat_menu(control_id): singlechat_menu = [ ===================================== scripts/dev/pre-push-tests.sh ===================================== --- a/scripts/dev/pre-push-tests.sh +++ b/scripts/dev/pre-push-tests.sh @@ -1,5 +1,5 @@ mypy -p gajim.common.modules --follow-imports=skip -pylint --jobs=2 --disable=C0103,C0302,C0330,C0411,C0412,C0413,E0203,E0401,E0611,E0710,E0712,E1101,E1102,E1128,E1133,E1136,R0201,R0901,R0904,R0913,R0916,R1702,R1706,R1711,R1716,W0104,W0105,W0108,W0109,W0123,W0143,W0201,W0212,W0221,W0223,W0311,W0401,W0603,W0613,W0614,W0631,W0640,W1401,W1505 gajim +pylint --jobs=2 --disable=C0103,C0302,C0330,C0411,C0412,C0413,E0203,E0401,E0611,E0710,E0712,E1101,E1102,E1128,E1133,E1136,R0201,R0901,R0904,R0913,R0916,R1702,R1706,R1711,R1716,W0109,W0123,W0143,W0201,W0212,W0221,W0223,W0311,W0401,W0603,W0613,W0614,W0631,W0640,W1401,W1505 gajim # C0103 invalid-name # C0302 too-many-lines View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c2828231bd217d59039b98676415d2e82… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c2828231bd217d59039b98676415d2e82… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: Fix unneeded-not pylint errors
by Philipp Hörist 18 Sep '18

18 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 31a50024 by Philipp Hörist at 2018-09-18T14:03:35Z Fix unneeded-not pylint errors - - - - - 6b548631 by Philipp Hörist at 2018-09-18T14:28:33Z Dont move window between virtual desktops Its the job of the window manager to restore a window to the correct location - - - - - c3e897bd by Philipp Hörist at 2018-09-18T14:29:26Z Fix pylint errors - used-before-assignment - misplaced-bare-raise - - - - - c2828231 by Philipp Hörist at 2018-09-18T14:32:31Z Update pylint error list - Check for E0601 used-before-assignment - Check for E0704 misplaced-bare-raise - Check for W0101 unreachable - - - - - 7 changed files: - .gitlab-ci.yml - gajim/gtkgui_helpers.py - gajim/gui_interface.py - gajim/history_manager.py - gajim/plugins/gui.py - gajim/statusicon.py - scripts/dev/pre-push-tests.sh Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,7 +19,7 @@ run-mypy: run-pylint: stage: test script: - - pylint3 --jobs=2 --disable=C0103,C0302,C0330,C0411,C0412,C0413,E0203,E0401,E0601,E0611,E0704,E0710,E0712,E1101,E1102,E1128,E1133,E1136,R0201,R0901,R0904,R0913,R0916,R1702,R1706,R1711,R1716,W0101,W0104,W0105,W0108,W0109,W0123,W0143,W0201,W0212,W0221,W0223,W0311,W0401,W0603,W0613,W0614,W0631,W0640,W1401,W1505 gajim + - pylint3 --jobs=2 --disable=C0103,C0302,C0330,C0411,C0412,C0413,E0203,E0401,E0611,E0710,E0712,E1101,E1102,E1128,E1133,E1136,R0201,R0901,R0904,R0913,R0916,R1702,R1706,R1711,R1716,W0104,W0105,W0108,W0109,W0123,W0143,W0201,W0212,W0221,W0223,W0311,W0401,W0603,W0613,W0614,W0631,W0640,W1401,W1505 gajim run-build: stage: build ===================================== gajim/gtkgui_helpers.py ===================================== --- a/gajim/gtkgui_helpers.py +++ b/gajim/gtkgui_helpers.py @@ -316,39 +316,6 @@ def get_current_desktop(window): current_virtual_desktop_no = prop[2][0] return current_virtual_desktop_no -def possibly_move_window_in_current_desktop(window): - """ - Moves GTK window to current virtual desktop if it is not in the current - virtual desktop - - NOTE: Window is a GDK window. - """ - #TODO: property_get doesn't work: - #prop_atom = Gdk.Atom.intern('_NET_CURRENT_DESKTOP', False) - #type_atom = Gdk.Atom.intern("CARDINAL", False) - #w = Gdk.Screen.get_default().get_root_window() - #Gdk.property_get(w, prop_atom, type_atom, 0, 9999, False) - return False - if os.name == 'nt': - return False - - root_window = Gdk.Screen.get_default().get_root_window() - # current user's vd - current_virtual_desktop_no = get_current_desktop(root_window) - - # vd roster window is in - window_virtual_desktop = get_current_desktop(window.window) - - # if one of those is None, something went wrong and we cannot know - # VD info, just hide it (default action) and not show it afterwards - if None not in (window_virtual_desktop, current_virtual_desktop_no): - if current_virtual_desktop_no != window_virtual_desktop: - # we are in another VD that the window was - # so show it in current VD - window.present() - return True - return False - def file_is_locked(path_to_file): """ Return True if file is locked ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -2203,9 +2203,9 @@ class Interface: app.config.get_per('accounts', a, 'last_status_msg'))) continue show = app.config.get_per('accounts', a, 'autoconnect_as') - if not show in app.SHOW_LIST: + if show not in app.SHOW_LIST: continue - if not show in shows: + if show not in shows: shows[show] = [a] else: shows[show].append(a) ===================================== gajim/history_manager.py ===================================== --- a/gajim/history_manager.py +++ b/gajim/history_manager.py @@ -45,6 +45,7 @@ from gi.repository import Gio from gajim.common import app from gajim.common import i18n from gajim.common import configpaths +from gajim.common.i18n import _ from gajim.common.const import StyleAttr def is_standalone(): @@ -80,7 +81,6 @@ if is_standalone(): configpaths.init() app.load_css_config() -from gajim.common.i18n import _ from gajim.common.const import JIDConstant, KindConstant from gajim.common import helpers from gajim.gtk import YesNoDialog @@ -346,12 +346,7 @@ class HistoryManager: """ self.cur.execute('SELECT type FROM jids WHERE jid = ?', (jid,)) row = self.cur.fetchone() - if row is None: - raise - elif row[0] == JIDConstant.ROOM_TYPE: - return True - else: # normal type - return False + return row[0] == JIDConstant.ROOM_TYPE def _fill_logs_listview(self, jid): """ ===================================== gajim/plugins/gui.py ===================================== --- a/gajim/plugins/gui.py +++ b/gajim/plugins/gui.py @@ -114,7 +114,6 @@ class PluginsWindow: app.plugin_manager.gui_extension_point('plugin_window', self) self.window.show_all() - gtkgui_helpers.possibly_move_window_in_current_desktop(self.window) def on_key_press_event(self, widget, event): if event.keyval == Gdk.KEY_Escape: ===================================== gajim/statusicon.py ===================================== --- a/gajim/statusicon.py +++ b/gajim/statusicon.py @@ -368,17 +368,12 @@ class StatusIcon: win = app.interface.roster.window if not app.events.get_systray_events(): # No pending events, so toggle visible/hidden for roster window - if win.get_property('visible') and (win.get_property( - 'has-toplevel-focus') or os.name == 'nt'): - # visible in ANY virtual desktop? - - # we could be in another VD right now. eg vd2 - # and we want to show it in vd2 - if not gtkgui_helpers.possibly_move_window_in_current_desktop( - win) and app.config.get('save-roster-position'): - x, y = win.get_position() - app.config.set('roster_x-position', x) - app.config.set('roster_y-position', y) + if win.get_property('visible'): + if win.get_property('has-toplevel-focus') or os.name == 'nt': + if app.config.get('save-roster-position'): + x, y = win.get_position() + app.config.set('roster_x-position', x) + app.config.set('roster_y-position', y) win.hide() # else we hide it from VD that was visible in else: if not win.get_property('visible'): ===================================== scripts/dev/pre-push-tests.sh ===================================== --- a/scripts/dev/pre-push-tests.sh +++ b/scripts/dev/pre-push-tests.sh @@ -1,2 +1,15 @@ mypy -p gajim.common.modules --follow-imports=skip -pylint --jobs=2 --disable=C0103,C0302,C0330,C0411,C0412,C0413,E0203,E0401,E0601,E0611,E0704,E0710,E0712,E1101,E1102,E1128,E1133,E1136,R0201,R0901,R0904,R0913,R0916,R1702,R1706,R1711,R1716,W0101,W0104,W0105,W0108,W0109,W0123,W0143,W0201,W0212,W0221,W0223,W0311,W0401,W0603,W0613,W0614,W0631,W0640,W1401,W1505 gajim \ No newline at end of file +pylint --jobs=2 --disable=C0103,C0302,C0330,C0411,C0412,C0413,E0203,E0401,E0611,E0710,E0712,E1101,E1102,E1128,E1133,E1136,R0201,R0901,R0904,R0913,R0916,R1702,R1706,R1711,R1716,W0104,W0105,W0108,W0109,W0123,W0143,W0201,W0212,W0221,W0223,W0311,W0401,W0603,W0613,W0614,W0631,W0640,W1401,W1505 gajim + +# C0103 invalid-name +# C0302 too-many-lines +# C0330 bad-continuation +# C0411 wrong-import-order +# C0412 ungrouped-imports +# C0413 wrong-import-position +# E0203 access-member-before-definition +# E0401 import-error +# E0611 no-name-in-module +# E0710 raising-non-exception - GLIB +# E0712 catching-non-exception - GLIB +# R0201 no-self-use \ No newline at end of file View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/8fad65ccbf6fcc73cd55be45634dead9b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/8fad65ccbf6fcc73cd55be45634dead9b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Fix pylint errors
by Philipp Hörist 18 Sep '18

18 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1680c3bb by Philipp Hörist at 2018-09-18T13:24:40Z Fix pylint errors - consider-using-enumerate - unneeded-not - unidiomatic-typecheck - - - - - 13a88533 by Philipp Hörist at 2018-09-18T13:45:39Z Fix pylint errors - bad-mcs-method-argument - trailing-newlines - no-self-argument - - - - - 8fad65cc by Philipp Hörist at 2018-09-18T13:57:34Z Update pylint error list - Check for C0113 unneeded-not - Check for C0123 unidiomatic-typecheck - Check for C0203 bad-mcs-method-argument - Check for C0200 consider-using-enumerate - Check for C0305 trailing-newlines - Check for E0213 no-self-argument - - - - - 11 changed files: - .gitlab-ci.yml - gajim/cell_renderer_image.py - gajim/command_system/dispatcher.py - gajim/command_system/implementation/standard.py - gajim/common/connection_handlers.py - gajim/common/zeroconf/zeroconf_avahi.py - gajim/dataforms_widget.py - gajim/gtk/account_wizard.py - gajim/gtk/preferences.py - gajim/gui_interface.py - scripts/dev/pre-push-tests.sh Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,7 +19,7 @@ run-mypy: run-pylint: stage: test script: - - pylint3 --jobs=2 --disable=C0103,C0113,C0123,C0200,C0203,C0302,C0305,C0330,C0411,C0412,C0413,E0203,E0213,E0401,E0601,E0611,E0704,E0710,E0712,E1101,E1102,E1128,E1133,E1136,R0201,R0901,R0904,R0913,R0916,R1702,R1706,R1711,R1716,W0101,W0104,W0105,W0108,W0109,W0123,W0143,W0201,W0212,W0221,W0223,W0311,W0401,W0603,W0613,W0614,W0631,W0640,W1401,W1505 gajim + - pylint3 --jobs=2 --disable=C0103,C0302,C0330,C0411,C0412,C0413,E0203,E0401,E0601,E0611,E0704,E0710,E0712,E1101,E1102,E1128,E1133,E1136,R0201,R0901,R0904,R0913,R0916,R1702,R1706,R1711,R1716,W0101,W0104,W0105,W0108,W0109,W0123,W0143,W0201,W0212,W0221,W0223,W0311,W0401,W0603,W0613,W0614,W0631,W0640,W1401,W1505 gajim run-build: stage: build ===================================== gajim/cell_renderer_image.py ===================================== --- a/gajim/cell_renderer_image.py +++ b/gajim/cell_renderer_image.py @@ -42,11 +42,11 @@ class CellRendererImage(Gtk.CellRendererPixbuf): def do_get_property(self, pspec): return getattr(self, pspec.name) - def do_activate(event, widget, path, bg_area, cell_area, flags): + def do_activate(self, *args, **kwargs): """Renderers cannot be activated; always return True.""" return True - def do_editing_started(event, widget, path, fb_area, cell_area, flags): + def do_editing_started(self, *args, **kwargs): """Renderers cannot be edited; always return None.""" return None ===================================== gajim/command_system/dispatcher.py ===================================== --- a/gajim/command_system/dispatcher.py +++ b/gajim/command_system/dispatcher.py @@ -104,32 +104,32 @@ def list_commands(host): class Dispatchable(type): # pylint: disable=no-value-for-parameter - def __init__(self, name, bases, namespace): - parents = super(Dispatchable, self) + def __init__(cls, name, bases, namespace): + parents = super(Dispatchable, cls) parents.__init__(name, bases, namespace) if not is_root(namespace): - self.dispatch() + cls.dispatch() - def dispatch(self): - if self.AUTOMATIC: - self.enable() + def dispatch(cls): + if cls.AUTOMATIC: + cls.enable() class Host(Dispatchable): - def enable(self): - add_host(self) + def enable(cls): + add_host(cls) - def disable(self): - remove_host(self) + def disable(cls): + remove_host(cls) class Container(Dispatchable): - def enable(self): - add_container(self) - add_commands(self) + def enable(cls): + add_container(cls) + add_commands(cls) - def disable(self): - remove_commands(self) - remove_container(self) + def disable(cls): + remove_commands(cls) + remove_container(cls) ===================================== gajim/command_system/implementation/standard.py ===================================== --- a/gajim/command_system/implementation/standard.py +++ b/gajim/command_system/implementation/standard.py @@ -400,4 +400,3 @@ class StandardGroupChatCommands(CommandContainer): raise CommandError(_('Command is not supported for zeroconf accounts')) gc_c = app.contacts.get_gc_contact(self.account, self.room_jid, nick) app.connections[self.account].get_module('Ping').send_ping(gc_c) - ===================================== gajim/common/connection_handlers.py ===================================== --- 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: ===================================== gajim/common/zeroconf/zeroconf_avahi.py ===================================== --- 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 ===================================== gajim/dataforms_widget.py ===================================== --- 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: ===================================== gajim/gtk/account_wizard.py ===================================== --- 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): ===================================== gajim/gtk/preferences.py ===================================== --- 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: ===================================== gajim/gui_interface.py ===================================== --- 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, ===================================== scripts/dev/pre-push-tests.sh ===================================== --- a/scripts/dev/pre-push-tests.sh +++ b/scripts/dev/pre-push-tests.sh @@ -1,2 +1,2 @@ mypy -p gajim.common.modules --follow-imports=skip -pylint --jobs=2 --disable=C0103,C0113,C0123,C0200,C0203,C0302,C0305,C0330,C0411,C0412,C0413,E0203,E0213,E0401,E0601,E0611,E0704,E0710,E0712,E1101,E1102,E1128,E1133,E1136,R0201,R0901,R0904,R0913,R0916,R1702,R1706,R1711,R1716,W0101,W0104,W0105,W0108,W0109,W0123,W0143,W0201,W0212,W0221,W0223,W0311,W0401,W0603,W0613,W0614,W0631,W0640,W1401,W1505 gajim \ No newline at end of file +pylint --jobs=2 --disable=C0103,C0302,C0330,C0411,C0412,C0413,E0203,E0401,E0601,E0611,E0704,E0710,E0712,E1101,E1102,E1128,E1133,E1136,R0201,R0901,R0904,R0913,R0916,R1702,R1706,R1711,R1716,W0101,W0104,W0105,W0108,W0109,W0123,W0143,W0201,W0212,W0221,W0223,W0311,W0401,W0603,W0613,W0614,W0631,W0640,W1401,W1505 gajim \ No newline at end of file View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/251dbae5d631414120915d59c1dc02f87… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/251dbae5d631414120915d59c1dc02f87… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update pylint error list
by Philipp Hörist 18 Sep '18

18 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 251dbae5 by Philipp Hörist at 2018-09-18T12:46:35Z Update pylint error list Specify from now on the errors that are disabled instead of enabled, because we have now more checks enabled than disabled - - - - - 2 changed files: - .gitlab-ci.yml - scripts/dev/pre-push-tests.sh Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,7 +19,7 @@ run-mypy: run-pylint: stage: test script: - - pylint3 --jobs=2 --additional-builtins=_ --disable=all --enable=C0121,C0201,C0303,C0321,C0325,C0326,C1801,E0001,E0011,E0012,E0100,E0101,E0102,E0103,E0104,E0105,E0106,E0107,E0108,E0202,E0221,E0222,E0235,E0501,E0502,E0503,E0602,E0603,E0604,E0701,E0702,E1001,E1002,E1003,E1004,E1111,E1120,E1121,E1122,E1123,E1124,E1125,E1200,E1201,E1205,E1206,E1300,E1301,E1302,E1303,E1304,E1305,E1306,E1310,E1700,E1701,R0123,R0205,R1703,R1704,R1705,R1707,R1714,W0102,W0107,W0235,W0611,W0612,W0621,W0622,W0702,W1201,W1202 gajim + - pylint3 --jobs=2 --disable=C0103,C0113,C0123,C0200,C0203,C0302,C0305,C0330,C0411,C0412,C0413,E0203,E0213,E0401,E0601,E0611,E0704,E0710,E0712,E1101,E1102,E1128,E1133,E1136,R0201,R0901,R0904,R0913,R0916,R1702,R1706,R1711,R1716,W0101,W0104,W0105,W0108,W0109,W0123,W0143,W0201,W0212,W0221,W0223,W0311,W0401,W0603,W0613,W0614,W0631,W0640,W1401,W1505 gajim run-build: stage: build ===================================== scripts/dev/pre-push-tests.sh ===================================== --- a/scripts/dev/pre-push-tests.sh +++ b/scripts/dev/pre-push-tests.sh @@ -1,2 +1,2 @@ mypy -p gajim.common.modules --follow-imports=skip -pylint --jobs=2 --additional-builtins=_ --disable=all --enable=C0121,C0201,C0303,C0321,C0325,C0326,C1801,E0001,E0011,E0012,E0100,E0101,E0102,E0103,E0104,E0105,E0106,E0107,E0108,E0202,E0221,E0222,E0235,E0501,E0502,E0503,E0602,E0603,E0604,E0701,E0702,E1001,E1002,E1003,E1004,E1111,E1120,E1121,E1122,E1123,E1124,E1125,E1200,E1201,E1205,E1206,E1300,E1301,E1302,E1303,E1304,E1305,E1306,E1310,E1700,E1701,R0123,R0205,R1703,R1704,R1705,R1707,R1714,W0102,W0107,W0235,W0611,W0612,W0621,W0622,W0702,W1201,W1202 gajim +pylint --jobs=2 --disable=C0103,C0113,C0123,C0200,C0203,C0302,C0305,C0330,C0411,C0412,C0413,E0203,E0213,E0401,E0601,E0611,E0704,E0710,E0712,E1101,E1102,E1128,E1133,E1136,R0201,R0901,R0904,R0913,R0916,R1702,R1706,R1711,R1716,W0101,W0104,W0105,W0108,W0109,W0123,W0143,W0201,W0212,W0221,W0223,W0311,W0401,W0603,W0613,W0614,W0631,W0640,W1401,W1505 gajim \ No newline at end of file View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/251dbae5d631414120915d59c1dc02f87b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/251dbae5d631414120915d59c1dc02f87b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: Fix unnecessary-pass pylint errors
by Philipp Hörist 18 Sep '18

18 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8483ba50 by Philipp Hörist at 2018-09-18T12:03:58Z Fix unnecessary-pass pylint errors - - - - - a77804f4 by Philipp Hörist at 2018-09-18T12:06:16Z Fix useless-super-delegation pylint errors - - - - - 55aab55b by Philipp Hörist at 2018-09-18T12:10:38Z Fix consider-using-in pylint errors - - - - - 2512c2b4 by Philipp Hörist at 2018-09-18T12:14:26Z Update pylint error list - Check for R1714 consider-using-in - Check for W0107 unnecessary-pass - Check for W0235 useless-super-delegation - - - - - 8 changed files: - .gitlab-ci.yml - gajim/gtk/profile.py - gajim/gtk/service_registration.py - gajim/gui_interface.py - gajim/htmltextview.py - gajim/message_textview.py - gajim/message_window.py - scripts/dev/pre-push-tests.sh Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,7 +19,7 @@ run-mypy: run-pylint: stage: test script: - - pylint3 --jobs=2 --additional-builtins=_ --disable=all --enable=C0121,C0201,C0303,C0321,C0325,C0326,C1801,E0001,E0011,E0012,E0100,E0101,E0102,E0103,E0104,E0105,E0106,E0107,E0108,E0202,E0221,E0222,E0235,E0501,E0502,E0503,E0602,E0603,E0604,E0701,E0702,E1001,E1002,E1003,E1004,E1111,E1120,E1121,E1122,E1123,E1124,E1125,E1200,E1201,E1205,E1206,E1300,E1301,E1302,E1303,E1304,E1305,E1306,E1310,E1700,E1701,R0123,R0205,R1703,R1704,R1705,R1707,W0102,W0611,W0612,W0621,W0622,W0702,W1201,W1202 gajim + - pylint3 --jobs=2 --additional-builtins=_ --disable=all --enable=C0121,C0201,C0303,C0321,C0325,C0326,C1801,E0001,E0011,E0012,E0100,E0101,E0102,E0103,E0104,E0105,E0106,E0107,E0108,E0202,E0221,E0222,E0235,E0501,E0502,E0503,E0602,E0603,E0604,E0701,E0702,E1001,E1002,E1003,E1004,E1111,E1120,E1121,E1122,E1123,E1124,E1125,E1200,E1201,E1205,E1206,E1300,E1301,E1302,E1303,E1304,E1305,E1306,E1310,E1700,E1701,R0123,R0205,R1703,R1704,R1705,R1707,R1714,W0102,W0107,W0235,W0611,W0612,W0621,W0622,W0702,W1201,W1202 gajim run-build: stage: build ===================================== gajim/gtk/profile.py ===================================== --- a/gajim/gtk/profile.py +++ b/gajim/gtk/profile.py @@ -230,7 +230,7 @@ class ProfileWindow(Gtk.ApplicationWindow): button.show() text_button.hide() continue - if i == 'ADR' or i == 'TEL' or i == 'EMAIL': + if i in ('ADR', 'TEL', 'EMAIL'): for entry in vcard_[i]: add_on = '_HOME' if 'WORK' in entry: ===================================== gajim/gtk/service_registration.py ===================================== --- a/gajim/gtk/service_registration.py +++ b/gajim/gtk/service_registration.py @@ -81,7 +81,6 @@ class ServiceRegistration(Gtk.Assistant): elif self.get_current_page() == Page.SENDING: self._register() self.commit() - pass def _on_get_success(self, form, is_form): log.info('Show Form page') @@ -150,9 +149,6 @@ class SendingPage(RequestPage): title = _('Register') complete = False - def __init__(self): - super().__init__() - class FormPage(Gtk.Box): ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -1857,7 +1857,7 @@ class Interface: emoticons = emoji_data.get_regex() if app.config.get('ascii_emoticons'): emoticons += '|%s' % emoji_ascii_data.get_regex() - pass + self.emot_and_basic = '%s|%s' % (basic_pattern, emoticons) # at least one character in 3 parts (before @, after @, after .) ===================================== gajim/htmltextview.py ===================================== --- a/gajim/htmltextview.py +++ b/gajim/htmltextview.py @@ -804,7 +804,7 @@ class HtmlHandler(xml.sax.handler.ContentHandler): newLine = True elif name == 'img': pass - elif name == 'body' or name == 'html': + elif name in ('body', 'html'): pass elif name == 'a': pass ===================================== gajim/message_textview.py ===================================== --- a/gajim/message_textview.py +++ b/gajim/message_textview.py @@ -98,7 +98,7 @@ class MessageTextView(Gtk.TextView): buf = self.get_buffer() start, end = buf.get_bounds() text = buf.get_text(start, end, True) - return text != self.PLACEHOLDER and text != '' + return text not in (self.PLACEHOLDER, '') def get_text(self): # gets the text if its not PLACEHOLDER @@ -211,7 +211,7 @@ class MessageTextView(Gtk.TextView): _buffer.remove_all_tags(start, finish) def color_set(self, widget, response): - if response == -6 or response == -4: + if response in (-6, -4): widget.destroy() return @@ -238,7 +238,7 @@ class MessageTextView(Gtk.TextView): _buffer.apply_tag_by_name(tag_name, start, finish) def font_set(self, widget, response, start, finish): - if response == -6 or response == -4: + if response in (-6, -4): widget.destroy() return ===================================== gajim/message_window.py ===================================== --- a/gajim/message_window.py +++ b/gajim/message_window.py @@ -374,7 +374,7 @@ class MessageWindow: self.window.lookup_action( 'information-%s' % control.control_id).activate() return True - elif keyval == Gdk.KEY_l or keyval == Gdk.KEY_L: # CTRL + l|L + elif keyval in (Gdk.KEY_l, Gdk.KEY_L): # CTRL + l|L control.conv_textview.clear() return True elif keyval == Gdk.KEY_u: # CTRL + u: emacs style clear line ===================================== scripts/dev/pre-push-tests.sh ===================================== --- a/scripts/dev/pre-push-tests.sh +++ b/scripts/dev/pre-push-tests.sh @@ -1,2 +1,2 @@ mypy -p gajim.common.modules --follow-imports=skip -pylint --jobs=2 --additional-builtins=_ --disable=all --enable=C0121,C0201,C0303,C0321,C0325,C0326,C1801,E0001,E0011,E0012,E0100,E0101,E0102,E0103,E0104,E0105,E0106,E0107,E0108,E0202,E0221,E0222,E0235,E0501,E0502,E0503,E0602,E0603,E0604,E0701,E0702,E1001,E1002,E1003,E1004,E1111,E1120,E1121,E1122,E1123,E1124,E1125,E1200,E1201,E1205,E1206,E1300,E1301,E1302,E1303,E1304,E1305,E1306,E1310,E1700,E1701,R0123,R0205,R1703,R1704,R1705,R1707,W0102,W0611,W0612,W0621,W0622,W0702,W1201,W1202 gajim +pylint --jobs=2 --additional-builtins=_ --disable=all --enable=C0121,C0201,C0303,C0321,C0325,C0326,C1801,E0001,E0011,E0012,E0100,E0101,E0102,E0103,E0104,E0105,E0106,E0107,E0108,E0202,E0221,E0222,E0235,E0501,E0502,E0503,E0602,E0603,E0604,E0701,E0702,E1001,E1002,E1003,E1004,E1111,E1120,E1121,E1122,E1123,E1124,E1125,E1200,E1201,E1205,E1206,E1300,E1301,E1302,E1303,E1304,E1305,E1306,E1310,E1700,E1701,R0123,R0205,R1703,R1704,R1705,R1707,R1714,W0102,W0107,W0235,W0611,W0612,W0621,W0622,W0702,W1201,W1202 gajim View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/376fff7871a93cedba43e5e03d5a0e7fd… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/376fff7871a93cedba43e5e03d5a0e7fd… You're receiving this email because of your account on dev.gajim.org.

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits September 2018