Commits September 2018

commits@gajim.org

1 participants
100 discussions

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

18 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: ccc06a04 by Philipp Hörist at 2018-09-18T10:06:01Z Fix bad-whitespace pylint errors - - - - - 29647ea6 by Philipp Hörist at 2018-09-18T11:38:22Z Fix trailing-whitespace pylint errors - - - - - df88cc5e by Philipp Hörist at 2018-09-18T11:54:25Z Fix redefined-builtin pylint errors - - - - - 376fff78 by Philipp Hörist at 2018-09-18T12:00:50Z Update pylint error list - Check for W0622 redefined-builtin - Check for C0303 trailing-whitespace - Check for C0326 bad-whitespace - - - - - 30 changed files: - .gitlab-ci.yml - gajim/advanced_configuration_window.py - gajim/chat_control.py - gajim/chat_control_base.py - gajim/command_system/implementation/middleware.py - gajim/command_system/implementation/standard.py - gajim/common/app.py - gajim/common/caps_cache.py - gajim/common/config.py - gajim/common/connection.py - gajim/common/connection_handlers_events.py - gajim/common/events.py - gajim/common/helpers.py - gajim/common/logger.py - gajim/common/logging_helpers.py - gajim/common/proxy65_manager.py - gajim/common/rst_xhtml_generator.py - gajim/common/socks5.py - gajim/common/zeroconf/client_zeroconf.py - gajim/common/zeroconf/connection_zeroconf.py - gajim/common/zeroconf/roster_zeroconf.py - gajim/common/zeroconf/zeroconf_avahi.py - gajim/common/zeroconf/zeroconf_avahi_const.py - gajim/config.py - gajim/conversation_textview.py - gajim/dataforms_widget.py - gajim/dialogs.py - gajim/disco.py - gajim/filetransfers_window.py - gajim/gajim_remote.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/2acfcfd9f92f09a36ee0031a9bb807a2c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/2acfcfd9f92f09a36ee0031a9bb807a2c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 6 commits: Fix redefined-argument-from-local pylint errors
by Philipp Hörist 18 Sep '18

18 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: d6f02426 by Philipp Hörist at 2018-09-18T06:37:18Z Fix redefined-argument-from-local pylint errors - - - - - ff6ca570 by Philipp Hörist at 2018-09-18T08:16:54Z Fix no-else-return pylint errors - - - - - 66c8c26b by Philipp Hörist at 2018-09-18T08:18:12Z Update pylint error list - Check for R1704 redefined-argument-from-local - Check for R1705 no-else-return - - - - - 6237bfae by Philipp Hörist at 2018-09-18T08:26:27Z Fix singleton-comparison pylint errors - - - - - dea14648 by Philipp Hörist at 2018-09-18T08:30:33Z Fix multiple-statements pylint errors - - - - - 2acfcfd9 by Philipp Hörist at 2018-09-18T08:33:31Z Update pylint error list - Check for C0121 singleton-comparison - Check for C0321 multiple-statements - - - - - 30 changed files: - .gitlab-ci.yml - gajim/chat_control.py - gajim/chat_control_base.py - gajim/command_system/implementation/standard.py - gajim/common/app.py - gajim/common/caps_cache.py - gajim/common/config.py - gajim/common/connection.py - gajim/common/connection_handlers.py - gajim/common/contacts.py - gajim/common/file_props.py - gajim/common/gpg.py - gajim/common/helpers.py - gajim/common/jingle.py - gajim/common/jingle_rtp.py - gajim/common/logger.py - gajim/common/logging_helpers.py - gajim/common/optparser.py - gajim/common/pep.py - gajim/common/protocol/bytestream.py - gajim/common/proxy65_manager.py - gajim/common/socks5.py - gajim/common/zeroconf/client_zeroconf.py - gajim/common/zeroconf/zeroconf_avahi.py - gajim/common/zeroconf/zeroconf_bonjour.py - gajim/conversation_textview.py - gajim/dataforms_widget.py - gajim/dialogs.py - gajim/disco.py - gajim/filetransfers_window.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/cbe335b291903e1e39bdf3a99d157c7e5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/cbe335b291903e1e39bdf3a99d157c7e5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] keys() doesnt return list() in python3
by Philipp Hörist 18 Sep '18

18 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: cbe335b2 by Philipp Hörist at 2018-09-18T05:20:49Z keys() doesnt return list() in python3 - - - - - 3 changed files: - gajim/common/zeroconf/zeroconf_avahi.py - gajim/common/zeroconf/zeroconf_bonjour.py - gajim/message_window.py Changes: ===================================== gajim/common/zeroconf/zeroconf_avahi.py ===================================== --- a/gajim/common/zeroconf/zeroconf_avahi.py +++ b/gajim/common/zeroconf/zeroconf_avahi.py @@ -89,7 +89,7 @@ class Zeroconf: if not self.connected: return if name != self.name: - for key in self.contacts.keys(): # pylint: disable=C0201 + for key in list(self.contacts.keys()): val = self.contacts[key] if val[Constant.BARE_NAME] == name: # try to reduce instead of delete first ===================================== gajim/common/zeroconf/zeroconf_bonjour.py ===================================== --- a/gajim/common/zeroconf/zeroconf_bonjour.py +++ b/gajim/common/zeroconf/zeroconf_bonjour.py @@ -98,7 +98,7 @@ class Zeroconf: if not self.connected: return if name != self.name: - for key in self.contacts.keys(): # pylint: disable=C0201 + for key in list(self.contacts.keys()): if self.contacts[key][Constant.NAME] == name: del self.contacts[key] self.remove_serviceCB(key) ===================================== gajim/message_window.py ===================================== --- a/gajim/message_window.py +++ b/gajim/message_window.py @@ -1107,7 +1107,7 @@ class MessageWindowMgr(GObject.GObject): return False def _on_window_destroy(self, win): - for k in self._windows.keys(): # pylint: disable=C0201 + for k in list(self._windows.keys()): if self._windows[k].window == win: self.emit('window-delete', self._windows[k]) del self._windows[k] View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/cbe335b291903e1e39bdf3a99d157c7e52… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/cbe335b291903e1e39bdf3a99d157c7e52… You're receiving this email because of your account on dev.gajim.org.

1 0

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

17 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 04b70bf2 by Philipp Hörist at 2018-09-17T21:38:52Z Fix trailing-comma-tuple pylint errors - - - - - 206b87d7 by Philipp Hörist at 2018-09-17T21:42:23Z Update pylint error list Check for R1707 trailing-comma-tuple - - - - - 6 changed files: - .gitlab-ci.yml - gajim/command_system/implementation/custom.py - gajim/command_system/implementation/standard.py - gajim/common/idle.py - gajim/common/protocol/bytestream.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=C0201,C0325,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,W0102,W0611,W0612,W0621,W0702,W1201,W1202 gajim + - pylint3 --jobs=2 --additional-builtins=_ --disable=all --enable=C0201,C0325,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,R1707,W0102,W0611,W0612,W0621,W0702,W1201,W1202 gajim run-build: stage: build ===================================== gajim/command_system/implementation/custom.py ===================================== --- a/gajim/command_system/implementation/custom.py +++ b/gajim/command_system/implementation/custom.py @@ -77,7 +77,7 @@ class CustomChatCommands(CommandContainer): """ AUTOMATIC = True - HOSTS = ChatCommands, + HOSTS = (ChatCommands,) @command("squal", "bawl") def sing(self): @@ -100,7 +100,7 @@ class CustomPrivateChatCommands(CommandContainer): """ AUTOMATIC = True - HOSTS = PrivateChatCommands, + HOSTS = (PrivateChatCommands,) @command #Example string. Do not translate @@ -116,7 +116,7 @@ class CustomGroupChatCommands(CommandContainer): """ AUTOMATIC = True - HOSTS = GroupChatCommands, + HOSTS = (GroupChatCommands,) @command def fetch(self): ===================================== gajim/command_system/implementation/standard.py ===================================== --- a/gajim/command_system/implementation/standard.py +++ b/gajim/command_system/implementation/standard.py @@ -225,7 +225,7 @@ class StandardChatCommands(CommandContainer): """ AUTOMATIC = True - HOSTS = ChatCommands, + HOSTS = (ChatCommands,) class StandardPrivateChatCommands(CommandContainer): """ @@ -234,7 +234,7 @@ class StandardPrivateChatCommands(CommandContainer): """ AUTOMATIC = True - HOSTS = PrivateChatCommands, + HOSTS = (PrivateChatCommands,) class StandardGroupChatCommands(CommandContainer): """ @@ -243,7 +243,7 @@ class StandardGroupChatCommands(CommandContainer): """ AUTOMATIC = True - HOSTS = GroupChatCommands, + HOSTS = (GroupChatCommands,) @command @doc(_("Clear the text window")) ===================================== gajim/common/idle.py ===================================== --- a/gajim/common/idle.py +++ b/gajim/common/idle.py @@ -103,9 +103,9 @@ class XssIdleMonitor: raise OSError('libX11 could not be found.') libX11 = ctypes.cdll.LoadLibrary(libX11path) libX11.XOpenDisplay.restype = display_p - libX11.XOpenDisplay.argtypes = ctypes.c_char_p, + libX11.XOpenDisplay.argtypes = (ctypes.c_char_p,) libX11.XDefaultRootWindow.restype = xid - libX11.XDefaultRootWindow.argtypes = display_p, + libX11.XDefaultRootWindow.argtypes = (display_p,) libXsspath = ctypes.util.find_library('Xss') if libXsspath is None: ===================================== gajim/common/protocol/bytestream.py ===================================== --- a/gajim/common/protocol/bytestream.py +++ b/gajim/common/protocol/bytestream.py @@ -410,7 +410,7 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): except socket.gaierror: from gajim.common.connection_handlers_events import InformationEvent app.nec.push_incoming_event( - InformationEvent(None, dialog_name='wrong-host')), + InformationEvent(None, dialog_name='wrong-host')) def _add_addiditional_streamhosts_to_query(self, query, file_props): sender = file_props.sender ===================================== 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=C0201,C0325,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,W0102,W0611,W0612,W0621,W0702,W1201,W1202 gajim +pylint --jobs=2 --additional-builtins=_ --disable=all --enable=C0201,C0325,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,R1707,W0102,W0611,W0612,W0621,W0702,W1201,W1202 gajim View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/67bb5a57c36149d0a91fd207a75fef76c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/67bb5a57c36149d0a91fd207a75fef76c… You're receiving this email because of your account on dev.gajim.org.

1 0

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

17 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 158d013a by Philipp Hörist at 2018-09-17T21:03:45Z Fix literal-comparison pylint errors - - - - - 01694c6a by Philipp Hörist at 2018-09-17T21:25:55Z Fix simplifiable-if-statement pylint errors - - - - - 67bb5a57 by Philipp Hörist at 2018-09-17T21:26:52Z Update pylint error list - Check for R0123 literal-comparison - Check for R1703 simplifiable-if-statement - - - - - 11 changed files: - .gitlab-ci.yml - gajim/common/app.py - gajim/common/connection.py - gajim/common/dbus_support.py - gajim/common/zeroconf/client_zeroconf.py - gajim/conversation_textview.py - gajim/gtkgui_helpers.py - gajim/plugins/pluginmanager.py - gajim/remote_control.py - gajim/tooltips.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=C0201,C0325,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,R0205,W0102,W0611,W0612,W0621,W0702,W1201,W1202 gajim + - pylint3 --jobs=2 --additional-builtins=_ --disable=all --enable=C0201,C0325,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,W0102,W0611,W0612,W0621,W0702,W1201,W1202 gajim run-build: stage: build ===================================== gajim/common/app.py ===================================== --- a/gajim/common/app.py +++ b/gajim/common/app.py @@ -424,10 +424,8 @@ def account_supports_private_storage(account): def account_is_connected(account): if account not in connections: return False - if connections[account].connected > 1: # 0 is offline, 1 is connecting - return True - else: - return False + # 0 is offline, 1 is connecting + return connections[account].connected > 1 def is_invisible(account): return SHOW_LIST[connections[account].connected] == 'invisible' @@ -455,11 +453,9 @@ def get_number_of_securely_connected_accounts(): return num_of_secured def account_is_securely_connected(account): - if account_is_connected(account) and \ - account in con_types and con_types[account] in ('tls', 'ssl'): - return True - else: + if not account_is_connected(account): return False + return con_types.get(account) in ('tls', 'ssl') def get_transport_name_from_jid(jid, use_config_setting = True): """ ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -732,7 +732,7 @@ class Connection(CommonConnection, ConnectionHandlers): return is_form = data[2] conf = data[1] - if data[4] is not '': + if data[4] != '': helpers.replace_dataform_media(conf, data[4]) if self.new_account_form: def _on_register_result(result): ===================================== gajim/common/dbus_support.py ===================================== --- a/gajim/common/dbus_support.py +++ b/gajim/common/dbus_support.py @@ -145,16 +145,14 @@ def get_interface(interface, path, start_service=True): started = True if interface not in running_services: # try to start the service - if start_service and dbus_iface.StartServiceByName(interface, dbus.UInt32(0)) == 1: - started = True - else: - started = False + started = start_service and dbus_iface.StartServiceByName( + interface, dbus.UInt32(0)) == 1 if not started: return None obj = bus.get_object(interface, path) return dbus.Interface(obj, interface) - except Exception as e: - log.debug(str(e)) + except Exception as error: + log.debug(error) return None ===================================== gajim/common/zeroconf/client_zeroconf.py ===================================== --- a/gajim/common/zeroconf/client_zeroconf.py +++ b/gajim/common/zeroconf/client_zeroconf.py @@ -598,10 +598,7 @@ class P2PConnection(IdleObject, PlugIn): def _plug_idle(self): readable = self.state != 0 - if self.sendqueue or self.sendbuff: - writable = True - else: - writable = False + writable = self.sendqueue or self.sendbuff if self.writable != writable or self.readable != readable: app.idlequeue.plug_idle(self, writable, readable) ===================================== gajim/conversation_textview.py ===================================== --- a/gajim/conversation_textview.py +++ b/gajim/conversation_textview.py @@ -60,10 +60,7 @@ log = logging.getLogger('gajim.conversation_textview') def is_selection_modified(mark): name = mark.get_name() - if name and name in ('selection_bound', 'insert'): - return True - else: - return False + return name in ('selection_bound', 'insert') def has_focus(widget): return widget.get_state_flags() & Gtk.StateFlags.FOCUSED == \ @@ -82,14 +79,12 @@ class TextViewImage(Gtk.Image): def _get_selected(self): parent = self.get_parent() - if not parent or not self.anchor: return False + if not parent or not self.anchor: + return False buffer_ = parent.get_buffer() position = buffer_.get_iter_at_child_anchor(self.anchor) bounds = buffer_.get_selection_bounds() - if bounds and position.in_range(*bounds): - return True - else: - return False + return bounds and position.in_range(*bounds) def get_state(self): parent = self.get_parent() ===================================== gajim/gtkgui_helpers.py ===================================== --- a/gajim/gtkgui_helpers.py +++ b/gajim/gtkgui_helpers.py @@ -266,10 +266,7 @@ def set_unset_urgency_hint(window, unread_messages_no): messages or not """ if app.config.get('use_urgency_hint'): - if unread_messages_no > 0: - window.props.urgency_hint = True - else: - window.props.urgency_hint = False + window.props.urgency_hint = unread_messages_no > 0 def get_pixbuf_from_data(file_data): """ ===================================== gajim/plugins/pluginmanager.py ===================================== --- a/gajim/plugins/pluginmanager.py +++ b/gajim/plugins/pluginmanager.py @@ -629,7 +629,7 @@ class PluginManager(metaclass=Singleton): os.path.dirname(file_path)) for option in fields: - if conf.get('info', option) is '': + if conf.get('info', option) == '': raise configparser.NoOptionError(option, 'info') if option == 'description': setattr(module_attr, option, _(conf.get('info', option))) ===================================== gajim/remote_control.py ===================================== --- a/gajim/remote_control.py +++ b/gajim/remote_control.py @@ -90,7 +90,7 @@ class Server: args = list(parameters.unpack()) for i, sig in enumerate(self.method_inargs[method_name]): - if sig is 'h': + if sig == 'h': msg = invocation.get_message() fd_list = msg.get_unix_fd_list() args[i] = fd_list.get(args[i]) ===================================== gajim/tooltips.py ===================================== --- a/gajim/tooltips.py +++ b/gajim/tooltips.py @@ -139,11 +139,9 @@ class NotificationAreaTooltip(StatusTable): message = acct['message'] message = helpers.reduce_chars_newlines(message, 100, 1) message = GLib.markup_escape_text(message) - if acct['name'] in app.con_types and \ - app.con_types[acct['name']] in ('tls', 'ssl'): - show_lock = True - else: - show_lock = False + con_type = app.con_types.get(acct['name']) + show_lock = con_type in ('tls', 'ssl') + if message: self.add_status_row(file_path, acct['show'], GLib.markup_escape_text(acct['account_label']) + ' - ' + \ @@ -322,11 +320,9 @@ class RosterTooltip(Gtk.Window, StatusTable): message = acct['message'] message = helpers.reduce_chars_newlines(message, 100, 1) message = GLib.markup_escape_text(message) - if acct['name'] in app.con_types and \ - app.con_types[acct['name']] in ('tls', 'ssl'): - show_lock = True - else: - show_lock = False + con_type = app.con_types.get(acct['name']) + show_lock = con_type in ('tls', 'ssl') + if message: self.add_status_row(file_path, acct['show'], GLib.markup_escape_text(acct['account_label']) + ' - ' + \ ===================================== 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=C0201,C0325,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,R0205,W0102,W0611,W0612,W0621,W0702,W1201,W1202 gajim +pylint --jobs=2 --additional-builtins=_ --disable=all --enable=C0201,C0325,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,W0102,W0611,W0612,W0621,W0702,W1201,W1202 gajim View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/76333ec73a4453f6ce33d006e711f302d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/76333ec73a4453f6ce33d006e711f302d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Use keys() iteration if we modify the dict
by Philipp Hörist 17 Sep '18

17 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 76333ec7 by Philipp Hörist at 2018-09-17T20:51:42Z Use keys() iteration if we modify the dict - - - - - 3 changed files: - gajim/common/zeroconf/zeroconf_avahi.py - gajim/common/zeroconf/zeroconf_bonjour.py - gajim/message_window.py Changes: ===================================== gajim/common/zeroconf/zeroconf_avahi.py ===================================== --- a/gajim/common/zeroconf/zeroconf_avahi.py +++ b/gajim/common/zeroconf/zeroconf_avahi.py @@ -89,7 +89,7 @@ class Zeroconf: if not self.connected: return if name != self.name: - for key in self.contacts: + for key in self.contacts.keys(): # pylint: disable=C0201 val = self.contacts[key] if val[Constant.BARE_NAME] == name: # try to reduce instead of delete first ===================================== gajim/common/zeroconf/zeroconf_bonjour.py ===================================== --- a/gajim/common/zeroconf/zeroconf_bonjour.py +++ b/gajim/common/zeroconf/zeroconf_bonjour.py @@ -98,7 +98,7 @@ class Zeroconf: if not self.connected: return if name != self.name: - for key in self.contacts: + for key in self.contacts.keys(): # pylint: disable=C0201 if self.contacts[key][Constant.NAME] == name: del self.contacts[key] self.remove_serviceCB(key) ===================================== gajim/message_window.py ===================================== --- a/gajim/message_window.py +++ b/gajim/message_window.py @@ -1107,7 +1107,7 @@ class MessageWindowMgr(GObject.GObject): return False def _on_window_destroy(self, win): - for k in self._windows: + for k in self._windows.keys(): # pylint: disable=C0201 if self._windows[k].window == win: self.emit('window-delete', self._windows[k]) del self._windows[k] View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/76333ec73a4453f6ce33d006e711f302d4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/76333ec73a4453f6ce33d006e711f302d4… You're receiving this email because of your account on dev.gajim.org.

1 0

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

17 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 793184e7 by Philipp Hörist at 2018-09-17T20:34:15Z Fix consider-iterating-dictionary pylint errors - - - - - 55febc49 by Philipp Hörist at 2018-09-17T20:35:39Z Update pylint error list Check for C0201 consider-iterating-dictionary - - - - - 13 changed files: - .gitlab-ci.yml - gajim/advanced_configuration_window.py - gajim/common/app.py - gajim/common/helpers.py - gajim/common/socks5.py - gajim/common/zeroconf/zeroconf_avahi.py - gajim/common/zeroconf/zeroconf_bonjour.py - gajim/config.py - gajim/conversation_textview.py - gajim/groupchat_control.py - gajim/message_window.py - gajim/roster_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=C1801,C0325,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,R0205,W0102,W0611,W0612,W0621,W0702,W1201,W1202 gajim + - pylint3 --jobs=2 --additional-builtins=_ --disable=all --enable=C0201,C0325,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,R0205,W0102,W0611,W0612,W0621,W0702,W1201,W1202 gajim run-build: stage: build ===================================== gajim/advanced_configuration_window.py ===================================== --- a/gajim/advanced_configuration_window.py +++ b/gajim/advanced_configuration_window.py @@ -188,7 +188,7 @@ class AdvancedConfigurationWindow: modelrow = self.model[modelpath] option = modelrow[0] if modelrow[2] == self.types['boolean']: - for key in self.right_true_dict.keys(): + for key in self.right_true_dict: if self.right_true_dict[key] == modelrow[1]: modelrow[1] = str(key) newval = {'False': True, 'True': False}[modelrow[1]] ===================================== gajim/common/app.py ===================================== --- a/gajim/common/app.py +++ b/gajim/common/app.py @@ -449,7 +449,7 @@ def get_number_of_securely_connected_accounts(): Return the number of the accounts that are SSL/TLS connected """ num_of_secured = 0 - for account in connections.keys(): + for account in connections: if account_is_securely_connected(account): num_of_secured += 1 return num_of_secured ===================================== gajim/common/helpers.py ===================================== --- a/gajim/common/helpers.py +++ b/gajim/common/helpers.py @@ -1008,7 +1008,7 @@ def get_notification_icon_tooltip_dict(): total_messages, total_messages, total_messages) account['event_lines'].append(text) else: - for jid in messages.keys(): + for jid in messages: text = ngettext( '%d message pending', '%d messages pending', @@ -1034,7 +1034,7 @@ def get_notification_icon_tooltip_dict(): total_non_messages, total_non_messages,total_non_messages) account['event_lines'].append(text) else: - for jid in non_messages.keys(): + for jid in non_messages: text = ngettext('%d event pending', '%d events pending', non_messages[jid], non_messages[jid], non_messages[jid]) text += ' ' + _('from user %s') % (jid) ===================================== gajim/common/socks5.py ===================================== --- a/gajim/common/socks5.py +++ b/gajim/common/socks5.py @@ -294,7 +294,7 @@ class SocksQueue: def activate_proxy(self, idx): if not self.isHashInSockObjs(self.senders, idx): return - for key in self.senders.keys(): + for key in self.senders: if idx in key: sender = self.senders[key] if sender.file_props.type_ != 's': ===================================== gajim/common/zeroconf/zeroconf_avahi.py ===================================== --- a/gajim/common/zeroconf/zeroconf_avahi.py +++ b/gajim/common/zeroconf/zeroconf_avahi.py @@ -89,7 +89,7 @@ class Zeroconf: if not self.connected: return if name != self.name: - for key in self.contacts.keys(): + for key in self.contacts: val = self.contacts[key] if val[Constant.BARE_NAME] == name: # try to reduce instead of delete first ===================================== gajim/common/zeroconf/zeroconf_bonjour.py ===================================== --- a/gajim/common/zeroconf/zeroconf_bonjour.py +++ b/gajim/common/zeroconf/zeroconf_bonjour.py @@ -98,7 +98,7 @@ class Zeroconf: if not self.connected: return if name != self.name: - for key in self.contacts.keys(): + for key in self.contacts: if self.contacts[key][Constant.NAME] == name: del self.contacts[key] self.remove_serviceCB(key) ===================================== gajim/config.py ===================================== --- a/gajim/config.py +++ b/gajim/config.py @@ -341,7 +341,7 @@ class FakeDataForm(Gtk.Table): entry.grab_focus() def get_infos(self): - for name in self.entries.keys(): + for name in self.entries: self.infos[name] = self.entries[name].get_text() return self.infos @@ -390,7 +390,7 @@ class GroupchatConfigWindow: # Draw the edit affiliation list things add_on_vbox = self.xml.get_object('add_on_vbox') - for affiliation in self.affiliation_labels.keys(): + for affiliation in self.affiliation_labels: self.start_users_dict[affiliation] = {} hbox = Gtk.HBox(spacing=5) add_on_vbox.pack_start(hbox, False, True, 0) @@ -539,7 +539,7 @@ class GroupchatConfigWindow: form = self.data_form_widget.data_form con = app.connections[self.account] con.get_module('MUC').set_config(self.room_jid, form) - for affiliation in self.affiliation_labels.keys(): + for affiliation in self.affiliation_labels: users_dict = {} actual_jid_list = [] model = self.affiliation_treeview[affiliation].get_model() ===================================== gajim/conversation_textview.py ===================================== --- a/gajim/conversation_textview.py +++ b/gajim/conversation_textview.py @@ -352,7 +352,7 @@ class ConversationTextview(GObject.GObject): return False def del_handlers(self): - for i in self.handlers.keys(): + for i in self.handlers: if self.handlers[i].handler_is_connected(i): self.handlers[i].disconnect(i) del self.handlers ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -844,7 +844,7 @@ class GroupchatControl(ChatControlBase): col.add_attribute(rend[1], rend[3], rend[4]) col.set_cell_data_func(rend[1], rend[5], rend[6]) # set renderers properties - for renderer in self.renderers_propertys.keys(): + for renderer in self.renderers_propertys: renderer.set_property(self.renderers_propertys[renderer][0], self.renderers_propertys[renderer][1]) ===================================== gajim/message_window.py ===================================== --- a/gajim/message_window.py +++ b/gajim/message_window.py @@ -1107,7 +1107,7 @@ class MessageWindowMgr(GObject.GObject): return False def _on_window_destroy(self, win): - for k in self._windows.keys(): + for k in self._windows: if self._windows[k].window == win: self.emit('window-delete', self._windows[k]) del self._windows[k] ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -5545,7 +5545,7 @@ class RosterWindow: col.add_attribute(rend[1], rend[3], rend[4]) col.set_cell_data_func(rend[1], rend[5], rend[6]) # set renderers properties - for renderer in self.renderers_propertys.keys(): + for renderer in self.renderers_propertys: renderer.set_property(self.renderers_propertys[renderer][0], self.renderers_propertys[renderer][1]) ===================================== 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=C1801,C0325,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,R0205,W0102,W0611,W0612,W0621,W0702,W1201,W1202 gajim +pylint --jobs=2 --additional-builtins=_ --disable=all --enable=C0201,C0325,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,R0205,W0102,W0611,W0612,W0621,W0702,W1201,W1202 gajim View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/0b8b4f75c3c59971653c032468121d124… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/0b8b4f75c3c59971653c032468121d124… You're receiving this email because of your account on dev.gajim.org.

1 0

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

17 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0b8b4f75 by Philipp Hörist at 2018-09-17T20:20:19Z Fix pylint errors - - - - - 1 changed file: - gajim/common/connection.py Changes: ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -1784,36 +1784,38 @@ class Connection(CommonConnection, ConnectionHandlers): def get_password(self, callback, type_): if app.config.get_per('accounts', self.name, 'anonymous_auth') and \ type_ != 'ANONYMOUS': - app.nec.push_incoming_event(NonAnonymousServerErrorEvent(None, - conn=self)) + app.nec.push_incoming_event( + NonAnonymousServerErrorEvent(None, conn=self)) self._on_disconnected() return self.pasword_callback = (callback, type_) if type_ == 'X-MESSENGER-OAUTH2': client_id = app.config.get_per('accounts', self.name, - 'oauth2_client_id') + 'oauth2_client_id') refresh_token = app.config.get_per('accounts', self.name, - 'oauth2_refresh_token') + 'oauth2_refresh_token') if refresh_token: - renew_URL = 'https://oauth.live.com/token?client_id=' \ - '%(client_id)s&redirect_uri=https%%3A%%2F%%2Foauth.live.' \ - 'com%%2Fdesktop&grant_type=refresh_token&refresh_token=' \ - '%(refresh_token)s' % locals() - result = helpers.download_image(self.name, {'src': renew_URL})[0] + renew_url = ( + 'https://oauth.live.com/token?client_id=' + '%s&redirect_uri=https%%3A%%2F%%2Foauth.live.' + 'com%%2Fdesktop&grant_type=refresh_token&' + 'refresh_token=%s') % (client_id, refresh_token) + result = helpers.download_image(self.name, {'src': renew_url})[0] if result: dict_ = json.loads(result) if 'access_token' in dict_: self.set_password(dict_['access_token']) return script_url = app.config.get_per('accounts', self.name, - 'oauth2_redirect_url') - token_URL = 'https://oauth.live.com/authorize?client_id=' \ - '%(client_id)s&scope=wl.messenger%%20wl.offline_access&' \ - 'response_type=code&redirect_uri=%(script_url)s' % locals() - helpers.launch_browser_mailer('url', token_URL) + 'oauth2_redirect_url') + token_url = ( + 'https://oauth.live.com/authorize?client_id=' + '%s&scope=wl.messenger%%20wl.offline_access&' + 'response_type=code&redirect_uri=%s') % (client_id, script_url) + helpers.launch_browser_mailer('url', token_url) self.disconnect(on_purpose=True) - app.nec.push_incoming_event(Oauth2CredentialsRequiredEvent(None, - conn=self)) + app.nec.push_incoming_event( + Oauth2CredentialsRequiredEvent(None, conn=self)) return if self.password: self.set_password(self.password) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0b8b4f75c3c59971653c032468121d1242… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0b8b4f75c3c59971653c032468121d1242… You're receiving this email because of your account on dev.gajim.org.

1 0

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

17 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: e8ac6444 by Philipp Hörist at 2018-09-17T19:16:19Z Fix unused-variable pylint errors - - - - - 71feb0b2 by Philipp Hörist at 2018-09-17T19:16:24Z Update pylint error list Check for W0612 unused-variable - - - - - 30 changed files: - .gitlab-ci.yml - gajim/chat_control.py - gajim/chat_control_base.py - gajim/command_system/mapping.py - gajim/common/app.py - gajim/common/connection.py - gajim/common/connection_handlers.py - gajim/common/ged.py - gajim/common/helpers.py - gajim/common/jingle_ft.py - gajim/common/jingle_ftstates.py - gajim/common/jingle_session.py - gajim/common/jingle_xtls.py - gajim/common/logger.py - gajim/common/protocol/bytestream.py - gajim/common/proxy65_manager.py - gajim/common/rst_xhtml_generator.py - gajim/common/socks5.py - gajim/common/zeroconf/client_zeroconf.py - gajim/common/zeroconf/zeroconf.py - gajim/common/zeroconf/zeroconf_avahi.py - gajim/common/zeroconf/zeroconf_bonjour.py - gajim/conversation_textview.py - gajim/dialogs.py - gajim/disco.py - gajim/groupchat_control.py - gajim/gtk/bookmarks.py - gajim/gtk/dialogs.py - gajim/gtk/features.py - gajim/gtk/history.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c6e2335bf0f729980386471b07be173bd… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c6e2335bf0f729980386471b07be173bd… 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 17 Sep '18

17 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: c6e2335b by Philipp Hörist at 2018-09-17T17:15:51Z Update pylint error list Check for W1202 logging-format-interpolation - - - - - 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=C1801,C0325,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,R0205,W0102,W0611,W0621,W0702,W1201 gajim + - pylint3 --jobs=2 --additional-builtins=_ --disable=all --enable=C1801,C0325,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,R0205,W0102,W0611,W0621,W0702,W1201,W1202 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=C1801,C0325,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,R0205,W0102,W0611,W0621,W0702,W1201 gajim +pylint --jobs=2 --additional-builtins=_ --disable=all --enable=C1801,C0325,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,R0205,W0102,W0611,W0621,W0702,W1201,W1202 gajim View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c6e2335bf0f729980386471b07be173bd0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c6e2335bf0f729980386471b07be173bd0… 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