Philipp Hörist pushed to branch master at gajim / gajim

Commits: 328d250f by Philipp Hörist at 2018-09-16T12:36:54Z Fix evaluation for subject change

- - - - - c6547b6d by Philipp Hörist at 2018-09-16T12:42:18Z Fix superfluous-parens pylint errors

- - - - - adc94bdc by Philipp Hörist at 2018-09-16T12:44:09Z Update pylint error list

Check for C0325 superfluous-parens

- - - - -

21 changed files:

- .gitlab-ci.yml - gajim/chat_control.py - gajim/common/caps_cache.py - gajim/common/helpers.py - gajim/common/resolver.py - gajim/common/socks5.py - gajim/common/zeroconf/client_zeroconf.py - gajim/common/zeroconf/zeroconf_bonjour.py - gajim/config.py - gajim/dialogs.py - gajim/filetransfers_window.py - gajim/gajim_remote.py - gajim/groupchat_control.py - gajim/gtk/emoji_data.py - gajim/gtk/history.py - gajim/gtkgui_helpers.py - gajim/gui_interface.py - gajim/htmltextview.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,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 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 gajim

run-build: stage: build

===================================== gajim/chat_control.py ===================================== --- a/gajim/chat_control.py +++ b/gajim/chat_control.py @@ -1428,7 +1428,7 @@ class ChatControl(ChatControlBase): typ = 'pm'

self.redraw_after_event_removed(jid) - if (self.contact.show in ('offline', 'error')): + if self.contact.show in ('offline', 'error'): show_offline = app.config.get('showoffline') show_transports = app.config.get('show_transports_group') if (not show_transports and app.jid_is_transport(jid)) or \

===================================== gajim/common/caps_cache.py ===================================== --- a/gajim/common/caps_cache.py +++ b/gajim/common/caps_cache.py @@ -485,7 +485,7 @@ class MucCapsCache:

def is_subject_change_allowed(self, jid, affiliation): allowed = True - if affiliation in ('owner, admin'): + if affiliation in ('owner', 'admin'): return allowed

if jid in self.cache:

===================================== gajim/common/helpers.py ===================================== --- a/gajim/common/helpers.py +++ b/gajim/common/helpers.py @@ -1075,7 +1075,7 @@ def get_notification_icon_tooltip_text(): for account in accounts: account_name = account['name'] # Set account status, if not set above - if (show_more_accounts): + if show_more_accounts: message = '\n' + indent_with + ' %s - %s' text += message % (account_name, get_account_status(account)) # Account list shown, messages need to be indented more

===================================== gajim/common/resolver.py ===================================== --- a/gajim/common/resolver.py +++ b/gajim/common/resolver.py @@ -67,7 +67,7 @@ class CommonResolver(): if host + type_ in self.handlers: for callback in self.handlers[host + type_]: callback(host, result_list) - del(self.handlers[host + type_]) + del self.handlers[host + type_]

def start_resolve(self, host, type_): pass

===================================== gajim/common/socks5.py ===================================== --- a/gajim/common/socks5.py +++ b/gajim/common/socks5.py @@ -390,7 +390,7 @@ class SocksQueue: else: if reader.streamhost is not None: reader.streamhost['state'] = -1 - del(self.readers[key]) + del self.readers[key]

def remove_sender_by_key(self, key, do_disconnect=True): sender = self.senders[key] @@ -398,7 +398,7 @@ class SocksQueue: sender.disconnect() self.idlequeue.unplug_idle(sender.fd) self.idlequeue.remove_timeout(sender.fd) - del(self.senders[key]) + del self.senders[key] if self.connected > 0: self.connected -= 1

===================================== gajim/common/zeroconf/client_zeroconf.py ===================================== --- a/gajim/common/zeroconf/client_zeroconf.py +++ b/gajim/common/zeroconf/client_zeroconf.py @@ -105,7 +105,7 @@ class ZeroconfListener(IdleObject): for jid in self.conn_holder.getRoster().keys(): entry = self.conn_holder.getRoster().getItem(jid) for address in entry['addresses']: - if (address['address'] == ipaddr): + if address['address'] == ipaddr: from_jid = jid break P2PClient(sock[0], [{'host': ipaddr, 'address': ipaddr, 'port': sock[1][1]}], self.conn_holder, [], from_jid)

===================================== gajim/common/zeroconf/zeroconf_bonjour.py ===================================== --- a/gajim/common/zeroconf/zeroconf_bonjour.py +++ b/gajim/common/zeroconf/zeroconf_bonjour.py @@ -66,7 +66,7 @@ class Zeroconf: if errorCode != pybonjour.kDNSServiceErr_NoError: log.debug('Error in browse_callback: %s', str(errorCode)) return - if not (flags & pybonjour.kDNSServiceFlagsAdd): + if not flags & pybonjour.kDNSServiceFlagsAdd: self.remove_service_callback(serviceName) return

===================================== gajim/config.py ===================================== --- a/gajim/config.py +++ b/gajim/config.py @@ -109,7 +109,7 @@ class ManageProxiesWindow: model = self.proxies_treeview.get_model() proxies = app.config.get_per('proxies') i = 1 - while ('proxy' + str(i)) in proxies: + while 'proxy' + str(i) in proxies: i += 1 iter_ = model.append() model.set(iter_, 0, 'proxy' + str(i))

===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -751,8 +751,8 @@ class ChangeStatusMessageDialog(TimeoutDialog): def on_change_status_message_dialog_key_press_event(self, widget, event): self.countdown_enabled = False if event.keyval == Gdk.KEY_Return or \ - event.keyval == Gdk.KEY_KP_Enter: # catch CTRL+ENTER - if (event.get_state() & Gdk.ModifierType.CONTROL_MASK): + event.keyval == Gdk.KEY_KP_Enter: # catch CTRL+ENTER + if event.get_state() & Gdk.ModifierType.CONTROL_MASK: self.dialog.response(Gtk.ResponseType.OK) # Stop the event return True

===================================== gajim/filetransfers_window.py ===================================== --- a/gajim/filetransfers_window.py +++ b/gajim/filetransfers_window.py @@ -577,7 +577,7 @@ class FileTransfersWindow: app.interface.roster.draw_contact(jid, account) app.interface.roster.show_title() FilesProp.deleteFileProp(file_props) - del(file_props) + del file_props

def set_progress(self, typ, sid, transfered_size, iter_=None): """

===================================== gajim/gajim_remote.py ===================================== --- a/gajim/gajim_remote.py +++ b/gajim/gajim_remote.py @@ -436,7 +436,7 @@ class GajimRemote: res = self.print_info(level+1, val) if res != '': ret_str += '%s%s: \n%s' % (spacing, key, res) - if (encode_return): + if encode_return: try: ret_str = ret_str.encode(PREFERRED_ENCODING) except Exception:

===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -1474,7 +1474,7 @@ class GroupchatControl(ChatControlBase):

for special_word in special_words: found_here = text.find(special_word) - while(found_here > -1): + while found_here > -1: end_here = found_here + len(special_word) if (found_here == 0 or not text[found_here - 1].isalpha()) and \ (end_here == len(text) or not text[end_here].isalpha()): @@ -2783,7 +2783,7 @@ class GroupchatControl(ChatControlBase): is set this way) """ if path.get_depth() == 1: # It's a group - if (widget.row_expanded(path)): + if widget.row_expanded(path): widget.collapse_row(path) else: widget.expand_row(path, False) @@ -2834,7 +2834,7 @@ class GroupchatControl(ChatControlBase): self.room_jid): # it's a group if x < 27: - if (widget.row_expanded(path)): + if widget.row_expanded(path): widget.collapse_row(path) else: widget.expand_row(path, False)

===================================== gajim/gtk/emoji_data.py ===================================== --- a/gajim/gtk/emoji_data.py +++ b/gajim/gtk/emoji_data.py @@ -145,7 +145,7 @@ class EmojiAsciiData(dict): # escape regexp metachars emoticon_escaped = re.escape(emoticon) emoticons_pattern += emoticon_escaped + '|' - if (emoticon_length != len(emoticon)): + if emoticon_length != len(emoticon): # Build up expressions to match emoticons next to others pre_pattern = pre_pattern[:-1] + ')|(?<=' post_pattern = post_pattern[:-1] + ')|(?='

===================================== gajim/gtk/history.py ===================================== --- a/gajim/gtk/history.py +++ b/gajim/gtk/history.py @@ -412,7 +412,7 @@ class HistoryWindow: log = time.localtime(timestamp) y, m, d = log[0], log[1], log[2] date = datetime.datetime(y, m, d) - return(date) + return date

def _change_date(self, widget): # Get day selected in calendar

===================================== gajim/gtkgui_helpers.py ===================================== --- a/gajim/gtkgui_helpers.py +++ b/gajim/gtkgui_helpers.py @@ -732,7 +732,7 @@ def make_jabber_state_images(): app.interface.jabber_state_images['32'] = load_iconset(path)

path = os.path.join(helpers.get_iconset_path(iconset), '24x24') - if (os.path.exists(path)): + if os.path.exists(path): app.interface.jabber_state_images['24'] = load_iconset(path) else: # Resize 32x32 icons to 24x24

===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -358,7 +358,7 @@ class Interface: elif (obj.errcode == '404') or (obj.errcon in ('item-not-found', 'remote-server-not-found')): # remote server does not exist - if (obj.errcon == 'remote-server-not-found'): + if obj.errcon == 'remote-server-not-found': self.handle_gc_error(gc_control, _('Unable to join group chat'), _('Remote server <b>%s</b> does not exist.') % obj.room_jid) # group chat does not exist

===================================== gajim/htmltextview.py ===================================== --- a/gajim/htmltextview.py +++ b/gajim/htmltextview.py @@ -1063,7 +1063,7 @@ class HtmlTextView(Gtk.TextView): if bounds: (search_iter, end) = bounds

- while (search_iter.compare(end)): + while search_iter.compare(end): character = search_iter.get_char() if character == '\ufffc': anchor = search_iter.get_child_anchor()

===================================== gajim/message_window.py ===================================== --- a/gajim/message_window.py +++ b/gajim/message_window.py @@ -722,7 +722,7 @@ class MessageWindow: return self._widget_to_control(nth_child)

def has_control(self, jid, acct): - return (acct in self._controls and jid in self._controls[acct]) + return acct in self._controls and jid in self._controls[acct]

def change_key(self, old_jid, new_jid, acct): """

===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -1149,7 +1149,7 @@ class RosterWindow: # Hide group if no more contacts iterG = self._get_group_iter(group, account, model=self.modelfilter) to_hide = [] - while(iterG): + while iterG: parent = self.modelfilter.iter_parent(iterG) if (not self.modelfilter.iter_has_child(iterG)) or (to_hide \ and self.modelfilter.iter_n_children(iterG) == 1): @@ -3220,8 +3220,9 @@ class RosterWindow: elif type_ == 'agent': self.on_remove_agent(widget, list_)

- elif not (event.get_state() & (Gdk.ModifierType.CONTROL_MASK | \ - Gdk.ModifierType.MOD1_MASK)): + elif not (event.get_state() & + (Gdk.ModifierType.CONTROL_MASK | + Gdk.ModifierType.MOD1_MASK)): num = Gdk.keyval_to_unicode(event.keyval) if num and num > 31: # if we got unicode symbol without ctrl / alt @@ -3362,7 +3363,7 @@ class RosterWindow: titer = model.get_iter(path) if x > x_min and x < x_min + 27 and type_ == 'contact' and \ model.iter_has_child(titer): - if (self.tree.row_expanded(path)): + if self.tree.row_expanded(path): self.tree.collapse_row(path) else: self.tree.expand_row(path, False) @@ -3375,13 +3376,13 @@ class RosterWindow: else: if type_ == 'group' and x < 27: # first cell in 1st column (the arrow SINGLE clicked) - if (self.tree.row_expanded(path)): + if self.tree.row_expanded(path): self.tree.collapse_row(path) else: self.expand_group_row(path)

elif type_ == 'contact' and x > x_min and x < x_min + 27: - if (self.tree.row_expanded(path)): + if self.tree.row_expanded(path): self.tree.collapse_row(path) else: self.tree.expand_row(path, False)

===================================== 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,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 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 gajim

View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b4ac6db9b9048ae549616a65896e4a28f8...