Commits September 2018

commits@gajim.org

1 participants
100 discussions

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

17 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: d638087c by Philipp Hörist at 2018-09-17T16:57:00Z Fix logging-not-lazy pylint errors - - - - - 7bdad5f4 by Philipp Hörist at 2018-09-17T16:57:52Z Update pylint error list Check for W1201 logging-not-lazy - - - - - 23 changed files: - .gitlab-ci.yml - gajim/common/connection.py - gajim/common/connection_handlers.py - gajim/common/connection_handlers_events.py - gajim/common/ged.py - gajim/common/helpers.py - gajim/common/jingle_ft.py - gajim/common/jingle_transport.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/filetransfers_window.py - gajim/groupchat_control.py - gajim/gtkgui_helpers.py - gajim/plugins/gajimplugin.py - gajim/plugins/helpers.py - gajim/plugins/pluginmanager.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,W0621,W0702 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 gajim run-build: stage: build ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -1094,7 +1094,7 @@ class Connection(CommonConnection, ConnectionHandlers): conn=self, title=pritxt, msg=sectxt)) def on_proxy_failure(self, reason): - log.error('Connection to proxy failed: %s' % reason) + log.error('Connection to proxy failed: %s', reason) self.time_to_reconnect = None self.on_connect_failure = None self.disconnect(on_purpose = True) @@ -1108,8 +1108,8 @@ class Connection(CommonConnection, ConnectionHandlers): log.info('Connect successfull') _con_type = con_type if _con_type != self._current_type: - log.info('Connecting to next host beacuse desired type is %s and returned is %s' - % (self._current_type, _con_type)) + log.info('Connecting to next host beacuse desired type ' + 'is %s and returned is %s', self._current_type, _con_type) self._connect_to_next_host() return con.RegisterDisconnectHandler(self._on_disconnected) @@ -1149,8 +1149,9 @@ class Connection(CommonConnection, ConnectionHandlers): self.on_connect_failure = None con.UnregisterDisconnectHandler(self._on_disconnected) con.RegisterDisconnectHandler(self.disconnectedReconnCB) - log.debug('Connected to server %s:%s with %s' % ( - self._current_host['host'], self._current_host['port'], con_type)) + log.debug('Connected to server %s:%s with %s', + self._current_host['host'], self._current_host['port'], + con_type) self.connection = con @@ -1222,7 +1223,7 @@ class Connection(CommonConnection, ConnectionHandlers): file = urlopen( url, cafile=cafile, timeout=2) except (URLError, ssl.CertificateError) as exc: - log.info('Error while requesting POSH: %s' % exc) + log.info('Error while requesting POSH: %s', exc) return if file.getcode() != 200: @@ -1274,7 +1275,7 @@ class Connection(CommonConnection, ConnectionHandlers): 'accounts', self.name, 'authentication_mechanisms').split() for mech in auth_mechs: if mech not in nbxmpp.auth_nb.SASL_AUTHENTICATION_MECHANISMS | set(['XEP-0078']): - log.warning("Unknown authentication mechanisms %s" % mech) + log.warning('Unknown authentication mechanisms %s', mech) if not auth_mechs: auth_mechs = None else: @@ -1332,7 +1333,7 @@ class Connection(CommonConnection, ConnectionHandlers): if not app.config.get_per('accounts', self.name, 'savepass'): # Forget password, it's wrong self.password = None - log.debug("Couldn't authenticate to %s" % self._hostname) + log.debug("Couldn't authenticate to %s", self._hostname) self.disconnect(on_purpose = True) app.nec.push_incoming_event(OurShowEvent(None, conn=self, show='offline')) ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -505,8 +505,8 @@ class ConnectionHandlers(ConnectionSocks5Bytestream, if obj.conn.name != self.name: return for jid in obj.jid_list: - log.debug('Removing contact %s due to unregistered transport %s' % \ - (jid, obj.agent)) + log.debug('Removing contact %s due to unregistered transport %s', + jid, obj.agent) self.get_module('Presence').unsubscribe(jid) # Transport contacts can't have 2 resources if jid in app.to_be_removed[self.name]: ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -96,7 +96,7 @@ class HelperEvent: tim = helpers.datetime_tuple(tag) self.timestamp = timegm(tim) except Exception: - log.error('wrong timestamp, ignoring it: ' + tag) + log.error('wrong timestamp, ignoring it: %s', tag) self.timestamp = time_time() def get_chatstate(self): @@ -253,7 +253,7 @@ PresenceHelperEvent): try: self.get_jid_resource() except Exception: - log.warning('Invalid JID: %s, ignoring it' % self.stanza.getFrom()) + log.warning('Invalid JID: %s, ignoring it', self.stanza.getFrom()) return jid_list = app.contacts.get_jid_list(self.conn.name) self.timestamp = None ===================================== gajim/common/ged.py ===================================== --- a/gajim/common/ged.py +++ b/gajim/common/ged.py @@ -77,12 +77,13 @@ class GlobalEventsDispatcher: try: self.handlers[event_name].remove((priority, handler)) except ValueError as error: - log.warning('''Function (%s) with priority "%s" never registered - as handler of event "%s". Couldn\'t remove. Error: %s''' - %(handler, priority, event_name, error)) + log.warning( + '''Function (%s) with priority "%s" never + registered as handler of event "%s". Couldn\'t remove. + Error: %s''', handler, priority, event_name, error) def raise_event(self, event_name, *args, **kwargs): - log.debug('%s Args: %s'%(event_name, str(args))) + log.debug('%s Args: %s', event_name, str(args)) if event_name in self.handlers: node_processed = False for priority, handler in self.handlers[event_name]: ===================================== gajim/common/helpers.py ===================================== --- a/gajim/common/helpers.py +++ b/gajim/common/helpers.py @@ -1355,7 +1355,7 @@ def _get_img_direct(attrs): req.add_header('User-Agent', 'Gajim ' + app.version) f = urllib.request.urlopen(req) except Exception as ex: - log.debug('Error loading image %s ' % attrs['src'] + str(ex)) + log.debug('Error loading image %s ', attrs['src'] + str(ex)) pixbuf = None alt = attrs.get('alt', 'Broken image') else: @@ -1368,7 +1368,7 @@ def _get_img_direct(attrs): deadline = time.time() + (10 * (max_size / 1048576)) while True: if time.time() > deadline: - log.debug('Timeout loading image %s ' % attrs['src']) + log.debug('Timeout loading image %s ', attrs['src']) mem = '' alt = attrs.get('alt', '') if alt: @@ -1378,7 +1378,7 @@ def _get_img_direct(attrs): try: temp = f.read(100) except socket.timeout as ex: - log.debug('Timeout loading image %s ' % attrs['src'] + str(ex)) + log.debug('Timeout loading image %s ', attrs['src'] + str(ex)) alt = attrs.get('alt', '') if alt: alt += '\n' @@ -1445,7 +1445,7 @@ def _get_img_proxy(attrs, proxy): else: alt += _('Error loading image') except Exception as ex: - log.debug('Error loading image %s ' % attrs['src'] + str(ex)) + log.debug('Error loading image %s ', attrs['src'] + str(ex)) pixbuf = None alt = attrs.get('alt', 'Broken image') return ('', alt) ===================================== gajim/common/jingle_ft.py ===================================== --- a/gajim/common/jingle_ft.py +++ b/gajim/common/jingle_ft.py @@ -350,7 +350,7 @@ class JingleFileTransfer(JingleContent): self.__send_candidate(args) def _on_connect_error(self, sid): - log.info('connect error, sid=' + sid) + log.info('connect error, sid=%s', sid) args = {'candError' : True, 'sendCand' : True} self.__send_candidate(args) ===================================== gajim/common/jingle_transport.py ===================================== --- a/gajim/common/jingle_transport.py +++ b/gajim/common/jingle_transport.py @@ -329,7 +329,7 @@ class JingleTransportSocks5(JingleTransport): return content def _on_proxy_auth_ok(self, proxy): - log.info('proxy auth ok for ' + str(proxy)) + log.info('proxy auth ok for %s', str(proxy)) # send activate request to proxy, send activated confirmation to peer if not self.connection: return ===================================== gajim/common/pep.py ===================================== --- a/gajim/common/pep.py +++ b/gajim/common/pep.py @@ -34,7 +34,7 @@ class AbstractPEP: def get_tag_as_PEP(cls, jid, account, event_tag): items = event_tag.getTag('items', {'node': cls.namespace}) if items: - log.debug("Received PEP 'user %s' from %s" % (cls.type_, jid)) + log.debug('Received PEP "user %s" from %s', cls.type_, jid) return cls(jid, account, items) else: return None ===================================== gajim/common/protocol/bytestream.py ===================================== --- a/gajim/common/protocol/bytestream.py +++ b/gajim/common/protocol/bytestream.py @@ -778,7 +778,7 @@ class ConnectionIBBytestream(ConnectionBytestream): Handles streams state change. Used internally. """ typ = stanza.getType() - log.debug('IBBIqHandler called typ->%s' % typ) + log.debug('IBBIqHandler called typ->%s', typ) if typ == 'set' and stanza.getTag('open'): self.StreamOpenHandler(conn, stanza) elif typ == 'set' and stanza.getTag('close'): @@ -808,8 +808,8 @@ class ConnectionIBBytestream(ConnectionBytestream): err = None sid = stanza.getTagAttr('open', 'sid') blocksize = stanza.getTagAttr('open', 'block-size') - log.debug('StreamOpenHandler called sid->%s blocksize->%s' % (sid, - blocksize)) + log.debug('StreamOpenHandler called sid->%s blocksize->%s', + sid, blocksize) file_props = FilesProp.getFilePropByTransportSid(self.name, sid) try: blocksize = int(blocksize) @@ -822,7 +822,8 @@ class ConnectionIBBytestream(ConnectionBytestream): if err: rep = nbxmpp.Error(stanza, err) else: - log.debug("Opening stream: id %s, block-size %s" % (sid, blocksize)) + log.debug("Opening stream: id %s, block-size %s", + sid, blocksize) rep = nbxmpp.Protocol('iq', stanza.getFrom(), 'result', stanza.getTo(), {'id': stanza.getID()}) file_props.block_size = blocksize @@ -934,7 +935,7 @@ class ConnectionIBBytestream(ConnectionBytestream): sid = stanza.getTagAttr('data', 'sid') seq = stanza.getTagAttr('data', 'seq') data = stanza.getTagData('data') - log.debug('ReceiveHandler called sid->%s seq->%s' % (sid, seq)) + log.debug('ReceiveHandler called sid->%s seq->%s', sid, seq) try: seq = int(seq) data = base64.b64decode(data.encode('utf-8')) @@ -951,8 +952,8 @@ class ConnectionIBBytestream(ConnectionBytestream): elif seq != file_props.seq: err = nbxmpp.ERR_UNEXPECTED_REQUEST else: - log.debug('Successfully received sid->%s %s+%s bytes' % (sid, - file_props.fp.tell(), len(data))) + log.debug('Successfully received sid->%s %s+%s bytes', + sid, file_props.fp.tell(), len(data)) file_props.seq += 1 file_props.started = True file_props.fp.write(data) @@ -964,7 +965,7 @@ class ConnectionIBBytestream(ConnectionBytestream): if file_props.received_len >= file_props.size: file_props.completed = True if err: - log.debug('Error on receive: %s' % err) + log.debug('Error on receive: %s', err) conn.send(nbxmpp.Error(nbxmpp.Iq(to=stanza.getFrom(), frm=stanza.getTo(), payload=[nbxmpp.Node(nbxmpp.NS_IBB + ' close')]), err, reply=0)) @@ -977,7 +978,7 @@ class ConnectionIBBytestream(ConnectionBytestream): Raise xmpppy event specifying successful data receive. """ sid = stanza.getTagAttr('close', 'sid') - log.debug('StreamCloseHandler called sid->%s' % sid) + log.debug('StreamCloseHandler called sid->%s', sid) # look in sending files file_props = FilesProp.getFilePropByTransportSid(self.name, sid) if file_props: @@ -1002,7 +1003,7 @@ class ConnectionIBBytestream(ConnectionBytestream): is agreed upon. """ syn_id = stanza.getID() - log.debug('IBBAllIqHandler called syn_id->%s' % syn_id) + log.debug('IBBAllIqHandler called syn_id->%s', syn_id) for file_props in FilesProp.getAllFileProp(): if not file_props.direction or not file_props.connected: # It's socks5 bytestream ===================================== gajim/common/proxy65_manager.py ===================================== --- a/gajim/common/proxy65_manager.py +++ b/gajim/common/proxy65_manager.py @@ -122,22 +122,22 @@ class ProxyResolver: self.state = S_FINISHED return self.state = S_INITIAL - log.info('start resolving %s:%s' % (self.host, self.port)) + log.info('start resolving %s:%s', self.host, self.port) self.receiver_tester = ReceiverTester(self.host, self.port, self.jid, self.sid, self.sender_jid, self._on_receiver_success, self._on_connect_failure) self.receiver_tester.connect() def _on_receiver_success(self): - log.debug('Receiver successfully connected %s:%s' % (self.host, - self.port)) + log.debug('Receiver successfully connected %s:%s', + self.host, self.port) self.host_tester = HostTester(self.host, self.port, self.jid, self.sid, self.sender_jid, self._on_connect_success, self._on_connect_failure) self.host_tester.connect() def _on_connect_success(self): - log.debug('Host successfully connected %s:%s' % (self.host, self.port)) + log.debug('Host successfully connected %s:%s', self.host, self.port) iq = nbxmpp.Protocol(name='iq', to=self.jid, typ='set') query = iq.setTag('query') query.setNamespace(nbxmpp.NS_BYTESTREAM) @@ -147,7 +147,7 @@ class ProxyResolver: activate.setData('test(a)gajim.org/test2') if self.active_connection: - log.debug('Activating bytestream on %s:%s' % (self.host, self.port)) + log.debug('Activating bytestream on %s:%s', self.host, self.port) self.active_connection.SendAndCallForResponse(iq, self._result_received) self.state = S_ACTIVATED @@ -162,11 +162,11 @@ class ProxyResolver: self._on_connect_failure() def keep_conf(self): - log.debug('Bytestream activated %s:%s' % (self.host, self.port)) + log.debug('Bytestream activated %s:%s', self.host, self.port) self.state = S_FINISHED def _on_connect_failure(self): - log.debug('Connection failed with %s:%s' % (self.host, self.port)) + log.debug('Connection failed with %s:%s', self.host, self.port) self.state = S_FINISHED self.host = None self.port = 0 @@ -318,9 +318,9 @@ class HostTester(Socks5, IdleObject): data = self._get_request_buff(self._get_sha1_auth()) self.send_raw(data) self.state += 1 - log.debug('Host authenticating to %s:%s' % (self.host, self.port)) + log.debug('Host authenticating to %s:%s', self.host, self.port) elif self.state == 3: - log.debug('Host authenticated to %s:%s' % (self.host, self.port)) + log.debug('Host authenticated to %s:%s', self.host, self.port) self.on_success() self.disconnect() self.state += 1 @@ -331,7 +331,7 @@ class HostTester(Socks5, IdleObject): try: self._sock.connect((self.host, self.port)) self._sock.setblocking(False) - log.debug('Host Connecting to %s:%s' % (self.host, self.port)) + log.debug('Host Connecting to %s:%s', self.host, self.port) self._send = self._sock.send self._recv = self._sock.recv except Exception as ee: @@ -351,7 +351,7 @@ class HostTester(Socks5, IdleObject): self._recv = self._sock.recv self.buff = b'' self.state = 1 # connected - log.debug('Host connected to %s:%s' % (self.host, self.port)) + log.debug('Host connected to %s:%s', self.host, self.port) self.idlequeue.plug_idle(self, True, False) return @@ -436,7 +436,7 @@ class ReceiverTester(Socks5, IdleObject): if version != 0x05 or method == 0xff: self.pollend() return - log.debug('Receiver authenticating to %s:%s' % (self.host, self.port)) + log.debug('Receiver authenticating to %s:%s', self.host, self.port) data = self._get_request_buff(self._get_sha1_auth()) self.send_raw(data) self.state += 1 @@ -448,7 +448,7 @@ class ReceiverTester(Socks5, IdleObject): if version != 0x05 or reply != 0x00: self.pollend() return - log.debug('Receiver authenticated to %s:%s' % (self.host, self.port)) + log.debug('Receiver authenticated to %s:%s', self.host, self.port) self.on_success() self.disconnect() self.state += 1 @@ -459,7 +459,7 @@ class ReceiverTester(Socks5, IdleObject): try: self._sock.setblocking(False) self._sock.connect((self.host, self.port)) - log.debug('Receiver Connecting to %s:%s' % (self.host, self.port)) + log.debug('Receiver Connecting to %s:%s', self.host, self.port) self._send = self._sock.send self._recv = self._sock.recv except Exception as ee: @@ -479,5 +479,5 @@ class ReceiverTester(Socks5, IdleObject): self._recv = self._sock.recv self.buff = '' self.state = 1 # connected - log.debug('Receiver connected to %s:%s' % (self.host, self.port)) + log.debug('Receiver connected to %s:%s', self.host, self.port) self.idlequeue.plug_idle(self, True, False) ===================================== gajim/common/socks5.py ===================================== --- a/gajim/common/socks5.py +++ b/gajim/common/socks5.py @@ -132,22 +132,22 @@ class SocksQueue: fp = fingerprint if receiving: if 'candidate_id' in streamhost: - log.debug('Trying to connect as receiver to cid ' + \ - streamhost['candidate_id']) + log.debug('Trying to connect as receiver to cid %s', + streamhost['candidate_id']) else: - log.debug('Trying to connect as receiver to jid ' + \ - streamhost['jid']) + log.debug('Trying to connect as receiver to jid %s', + streamhost['jid']) file_props.type_ = 'r' socks5obj = Socks5ReceiverClient(self.idlequeue, streamhost, transport_sid, file_props, fingerprint=fp) self.add_sockobj(account, socks5obj) else: if 'candidate_id' in streamhost: - log.debug('Trying to connect as sender to cid ' + \ - streamhost['candidate_id']) + log.debug('Trying to connect as sender to cid %s', + streamhost['candidate_id']) else: - log.debug('Trying to connect as sender to jid ' + \ - streamhost['jid']) + log.debug('Trying to connect as sender to jid %s', + streamhost['jid']) if file_props.sha_str: idx = file_props.sha_str else: @@ -175,9 +175,9 @@ class SocksQueue: streamhosts. Stop other attempts for connections """ if 'candidate_id' in streamhost: - log.debug('Connected to cid ' + streamhost['candidate_id']) + log.debug('Connected to cid %s', streamhost['candidate_id']) else: - log.debug('Connected to jid ' + streamhost['jid']) + log.debug('Connected to jid %s', streamhost['jid']) for host in file_props.streamhosts: if host != streamhost and 'idx' in host: if host['state'] == 1: @@ -240,9 +240,10 @@ class SocksQueue: Called when we loose connection during transfer """ if 'candidate_id' in streamhost: - log.debug('Connection refused to cid ' + streamhost['candidate_id']) + log.debug('Connection refused to cid %s', + streamhost['candidate_id']) else: - log.debug('Connection refused to jid ' + streamhost['jid']) + log.debug('Connection refused to jid %s', streamhost['jid']) if file_props is None: return streamhost['state'] = -1 @@ -641,7 +642,7 @@ class Socks5: add = self._recv(64) except (OpenSSL.SSL.WantReadError, OpenSSL.SSL.WantWriteError, OpenSSL.SSL.WantX509LookupError) as e: - log.info('SSL rehandshake request : ' + repr(e)) + log.info('SSL rehandshake request: %s', repr(e)) raise e except Exception: add = b'' @@ -658,7 +659,7 @@ class Socks5: self._send(raw_data) except (OpenSSL.SSL.WantReadError, OpenSSL.SSL.WantWriteError, OpenSSL.SSL.WantX509LookupError) as e: - log.info('SSL rehandshake request :' + repr(e)) + log.info('SSL rehandshake request: %s', repr(e)) raise e except Exception: self.disconnect() @@ -682,7 +683,7 @@ class Socks5: lenn = self._send(buff) except (OpenSSL.SSL.WantReadError, OpenSSL.SSL.WantWriteError, OpenSSL.SSL.WantX509LookupError) as e: - log.info('SSL rehandshake request :' + repr(e)) + log.info('SSL rehandshake request: %s', repr(e)) raise e except Exception as e: if e.errno not in (EINTR, ENOBUFS, EWOULDBLOCK): @@ -756,7 +757,7 @@ class Socks5: buff = self._recv(MAX_BUFF_LEN) except (OpenSSL.SSL.WantReadError, OpenSSL.SSL.WantWriteError, OpenSSL.SSL.WantX509LookupError) as e: - log.info('SSL rehandshake request :' + repr(e)) + log.info('SSL rehandshake request: %s', repr(e)) raise e except Exception: buff = b'' @@ -896,7 +897,7 @@ class Socks5: buff = self._recv().decode('utf-8') except (OpenSSL.SSL.WantReadError, OpenSSL.SSL.WantWriteError, OpenSSL.SSL.WantX509LookupError) as e: - log.info("SSL rehandshake request : " + repr(e)) + log.info("SSL rehandshake request: %s", repr(e)) raise e try: version, method = struct.unpack('!BB', buff) @@ -1269,8 +1270,9 @@ class Socks5Client(Socks5): def send_file(self): if self.ssl_errnum > 0: - log.error('remote certificate does not match the announced one.' + \ - '\nSSL Error: %d\nCancelling file transfer' % self.ssl_errnum) + log.error('remote certificate does not match the announced one.' + '\nSSL Error: %d\nCancelling file transfer', + self.ssl_errnum) self.file_props.error = -12 return -1 return super(Socks5Client, self).send_file() @@ -1435,7 +1437,7 @@ class Socks5Listener(IdleObject): self.ai = None continue if not self.ai: - log.error('unable to bind to port ' + str(self.port)) + log.error('unable to bind to port %s', str(self.port)) return None self._serv.listen(socket.SOMAXCONN) self._serv.setblocking(False) ===================================== gajim/common/zeroconf/client_zeroconf.py ===================================== --- a/gajim/common/zeroconf/client_zeroconf.py +++ b/gajim/common/zeroconf/client_zeroconf.py @@ -114,7 +114,7 @@ class ZeroconfListener(IdleObject): """ Free all resources, we are not listening anymore """ - log.info('Disconnecting ZeroconfListener: %s' % message) + log.info('Disconnecting ZeroconfListener: %s', message) app.idlequeue.remove_timeout(self.fd) app.idlequeue.unplug_idle(self.fd) self.fd = -1 @@ -252,8 +252,8 @@ class P2PClient(IdleObject): def _check_stream_start(self, ns, tag, attrs): if ns != NS_STREAMS or tag != 'stream': - log.error('Incorrect stream start: (%s,%s).Terminating!' % (tag, - ns), 'error') + log.error('Incorrect stream start: (%s,%s).Terminating!', + tag, ns) self.Connection.disconnect() if self.on_not_ok: self.on_not_ok('Connection to host could not be established: ' @@ -386,8 +386,8 @@ class P2PConnection(IdleObject, PlugIn): self.disconnect() return ai = self.ais.pop(0) - log.info('Trying to connect to %s through %s:%s', str(self.host), - ai[4][0], ai[4][1], exc_info=True) + log.info('Trying to connect to %s through %s:%s', + str(self.host), ai[4][0], ai[4][1], exc_info=True) try: self._sock = socket.socket(*ai[:3]) self._sock.setblocking(False) @@ -543,7 +543,7 @@ class P2PConnection(IdleObject, PlugIn): self.on_receive(received) else: # This should never happed, so we need the debug - log.error('Unhandled data received: %s' % received) + log.error('Unhandled data received: %s', received) self.disconnect() return True @@ -608,7 +608,7 @@ class P2PConnection(IdleObject, PlugIn): def _on_send(self): if self.sent_data and self.sent_data.strip(): - log.debug('sent: %s' % self.sent_data) + log.debug('sent: %s', self.sent_data) if hasattr(self._owner, 'Dispatcher'): self._owner.Dispatcher.Event( '', DATA_SENT, self.sent_data.decode('utf-8')) @@ -705,7 +705,7 @@ class ClientZeroconf: self.roster = None self.disconnecting = True for i in reversed(self.disconnect_handlers): - log.debug('Calling disconnect handler %s' % i) + log.debug('Calling disconnect handler %s', i) i() self.disconnecting = False ===================================== gajim/common/zeroconf/zeroconf_avahi.py ===================================== --- a/gajim/common/zeroconf/zeroconf_avahi.py +++ b/gajim/common/zeroconf/zeroconf_avahi.py @@ -60,7 +60,7 @@ class Zeroconf: pass def error_callback1(self, err): - log.debug('Error while resolving: ' + str(err)) + log.debug('Error while resolving: %s', str(err)) def error_callback(self, err): log.debug(str(err)) @@ -71,8 +71,8 @@ class Zeroconf: def new_service_callback(self, interface, protocol, name, stype, domain, flags): - log.debug('Found service %s in domain %s on %i.%i.' % (name, domain, - interface, protocol)) + log.debug('Found service %s in domain %s on %i.%i.', + name, domain, interface, protocol) if not self.connected: return @@ -84,8 +84,8 @@ class Zeroconf: def remove_service_callback(self, interface, protocol, name, stype, domain, flags): - log.debug('Service %s in domain %s on %i.%i disappeared.' % (name, - domain, interface, protocol)) + log.debug('Service %s in domain %s on %i.%i disappeared.', + name, domain, interface, protocol) if not self.connected: return if name != self.name: @@ -161,10 +161,10 @@ class Zeroconf: def service_resolved_callback(self, interface, protocol, name, stype, domain, host, aprotocol, address, port, txt, flags): - log.debug('Service data for service %s in domain %s on %i.%i:' - % (name, domain, interface, protocol)) - log.debug('Host %s (%s), port %i, TXT data: %s' % (host, address, - port, self.txt_array_to_dict(txt))) + log.debug('Service data for service %s in domain %s on %i.%i:', + name, domain, interface, protocol) + log.debug('Host %s (%s), port %i, TXT data: %s', + host, address, port, self.txt_array_to_dict(txt)) if not self.connected: return bare_name = name @@ -186,11 +186,13 @@ class Zeroconf: # IPv6 aprotocol responses via the same protocol, # so this probably needs to be revised again. if old_resolved_info[i][0:2] == (interface, protocol): - log.debug('Deleting resolved info for interface %i, protocol %i, host %s, aprotocol %i, address %s, port %i' % old_resolved_info[i]) + log.debug('Deleting resolved info for interface %s', + old_resolved_info[i]) del old_resolved_info[i] break resolved_info = resolved_info + old_resolved_info - log.debug('Collected resolved info is now: %s' % (resolved_info,)) + log.debug('Collected resolved info is now: %s', + resolved_info) self.contacts[name] = (name, domain, resolved_info, bare_name, txt) self.new_serviceCB(name) else: @@ -225,7 +227,7 @@ class Zeroconf: log.debug('Service successfully updated') def service_add_fail_callback(self, err): - log.debug('Error while adding service. %s' % str(err)) + log.debug('Error while adding service. %s', str(err)) if 'Local name collision' in str(err): alternative_name = self.server.GetAlternativeServiceName(self.username) self.name_conflictCB(alternative_name) @@ -234,7 +236,7 @@ class Zeroconf: self.disconnect() def server_state_changed_callback(self, state, error): - log.debug('server state changed to %s' % state) + log.debug('server state changed to %s', state) if state == ServerState.RUNNING: self.create_service() elif state in (ServerState.COLLISION, @@ -292,8 +294,8 @@ class Zeroconf: txt['status'] = 'avail' self.txt = txt - log.debug('Publishing service %s of type %s' % (self.name, - self.stype)) + log.debug('Publishing service %s of type %s', + self.name, self.stype) self.entrygroup.AddService(Interface.UNSPEC, Protocol.UNSPEC, dbus.UInt32(0), self.name, self.stype, '', '', dbus.UInt16(self.port), self.avahi_txt(), @@ -360,7 +362,7 @@ class Zeroconf: dbus.set_default_main_loop(main_loop) except ImportError: log.debug('Error: python-dbus needs to be installed. No ' - 'zeroconf support.') + 'zeroconf support.') return False if self.bus: return True ===================================== gajim/common/zeroconf/zeroconf_bonjour.py ===================================== --- a/gajim/common/zeroconf/zeroconf_bonjour.py +++ b/gajim/common/zeroconf/zeroconf_bonjour.py @@ -94,7 +94,7 @@ class Zeroconf: resolve_sdRef.close() def remove_service_callback(self, name): - log.info('Service %s disappeared.' % name) + log.info('Service %s disappeared.', name) if not self.connected: return if name != self.name: ===================================== gajim/conversation_textview.py ===================================== --- a/gajim/conversation_textview.py +++ b/gajim/conversation_textview.py @@ -1380,9 +1380,9 @@ class ConversationTextview(GObject.GObject): xhtml = xhtml.replace('/me', '<i>* %s</i>' % (name,), 1) self.tv.display_html(xhtml, self.tv, self, iter_=iter_) return - except Exception as e: - log.debug('Error processing xhtml: ' + str(e)) - log.debug('with |' + xhtml + '|') + except Exception as error: + log.debug('Error processing xhtml: %s', error) + log.debug('with |%s|', xhtml) # /me is replaced by name if name is given if name and (text.startswith('/me ') or text.startswith('/me\n')): ===================================== gajim/filetransfers_window.py ===================================== --- a/gajim/filetransfers_window.py +++ b/gajim/filetransfers_window.py @@ -351,12 +351,13 @@ class FileTransfersWindow: if file_props is None: return False if contact.supports(NS_JINGLE_FILE_TRANSFER_5): - log.info("contact %s supports jingle file transfer"%(contact.get_full_jid())) + log.info('contact %s supports jingle file transfer', + contact.get_full_jid()) app.connections[account].start_file_transfer(contact.get_full_jid(), file_props) self.add_transfer(account, contact, file_props) else: - log.info("contact does not support jingle file transfer") + log.info('contact does not support jingle file transfer') file_props.transport_sid = file_props.sid app.connections[account].send_file_request(file_props) self.add_transfer(account, contact, file_props) ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -1953,8 +1953,8 @@ class GroupchatControl(ChatControlBase): gc_c = app.contacts.get_gc_contact(self.account, self.room_jid, obj.nick) if not gc_c: - log.error('%s has an iter, but no gc_contact instance' % \ - obj.nick) + log.error('%s has an iter, but no gc_contact instance', + obj.nick) return actual_affiliation = gc_c.affiliation ===================================== gajim/gtkgui_helpers.py ===================================== --- a/gajim/gtkgui_helpers.py +++ b/gajim/gtkgui_helpers.py @@ -68,20 +68,20 @@ def get_icon_pixmap(icon_name, size=16, color=None, quiet=False): pixbuf, was_symbolic = iconinfo.load_symbolic(*color) return pixbuf return iconinfo.load_icon() - except GLib.GError as e: + except GLib.GError as error: if not quiet: - log.error('Unable to load icon %s: %s' % (icon_name, str(e))) + log.error('Unable to load icon %s: %s', icon_name, str(error)) def get_icon_path(icon_name, size=16): try: icon_info = gtk_icon_theme.lookup_icon(icon_name, size, 0) if icon_info == None: - log.error('Icon not found: %s' % icon_name) - return "" + log.error('Icon not found: %s', icon_name) + return '' else: return icon_info.get_filename() - except GLib.GError as e: - log.error("Unable to find icon %s: %s" % (icon_name, str(e))) + except GLib.GError as error: + log.error('Unable to find icon %s: %s', icon_name, str(error)) HAS_PYWIN32 = True @@ -484,8 +484,8 @@ def on_avatar_save_as_menuitem_activate(widget, avatar, default_name=''): # Save image try: pixbuf.savev(file_path, image_format, [], []) - except Exception as e: - log.error('Error saving avatar: %s' % str(e)) + except Exception as error: + log.error('Error saving avatar: %s', error) if os.path.exists(file_path): os.remove(file_path) new_file_path = '.'.join(file_path.split('.')[:-1]) + '.png' ===================================== gajim/plugins/gajimplugin.py ===================================== --- a/gajim/plugins/gajimplugin.py +++ b/gajim/plugins/gajimplugin.py @@ -270,9 +270,12 @@ class GajimPluginConfig(): s.close() self.save() except Exception: - log.warning('%s plugin config file not readable. Saving it as ' - '%s and creating a new one' % (self.plugin.short_name, - self.FILE_PATH.decode(locale.getpreferredencoding()) + '.bak')) + enc = locale.getpreferredencoding() + filename = self.FILE_PATH.decode(enc) + '.bak' + log.warning( + '%s plugin config file not readable. Saving it as ' + '%s and creating a new one', + self.plugin.short_name, filename) if os.path.exists(self.FILE_PATH + '.bak'): os.remove(self.FILE_PATH + '.bak') os.rename(self.FILE_PATH, self.FILE_PATH + '.bak') ===================================== gajim/plugins/helpers.py ===================================== --- a/gajim/plugins/helpers.py +++ b/gajim/plugins/helpers.py @@ -99,11 +99,9 @@ class log_calls: @functools.wraps(f) def wrapper(*args, **kwargs): - log.debug('%(funcname)s() <entered>'%{ - 'funcname': self.full_func_name}) + log.debug('%s() <entered>', self.full_func_name) result = f(*args, **kwargs) - log.debug('%(funcname)s() <left>'%{ - 'funcname': self.full_func_name}) + log.debug('%s() <left>', self.full_func_name) return result else: @functools.wraps(f) ===================================== gajim/plugins/pluginmanager.py ===================================== --- a/gajim/plugins/pluginmanager.py +++ b/gajim/plugins/pluginmanager.py @@ -144,9 +144,10 @@ class PluginManager(metaclass=Singleton): self.plugins.append(plugin) plugin.active = False else: - log.info('Not loading plugin %s v%s from module %s (identified by' - ' short name: %s). Plugin already loaded.' % (plugin.name, - plugin.version, plugin.__module__, plugin.short_name)) + log.info('Not loading plugin %s v%s from module %s ' + '(identified by short name: %s). Plugin already loaded.', + plugin.name, plugin.version, + plugin.__module__, plugin.short_name) @log_calls('PluginManager') def remove_plugin(self, plugin): @@ -314,8 +315,8 @@ class PluginManager(metaclass=Singleton): try: handlers[0](*args) except Exception as e: - log.warning('Error executing %s', handlers[0], - exc_info=True) + log.warning('Error executing %s', + handlers[0], exc_info=True) def _register_events_handlers_in_ged(self, plugin): for event_name, handler in plugin.events_handlers.items(): @@ -426,9 +427,9 @@ class PluginManager(metaclass=Singleton): if handler: try: handler(*gui_extension_point_args) - except Exception as e: - log.warning('Error executing %s', handler, - exc_info=True) + except Exception: + log.warning('Error executing %s', + handler, exc_info=True) self._remove_events_handler_from_ged(plugin) self._remove_network_events_from_nec(plugin) @@ -467,9 +468,9 @@ class PluginManager(metaclass=Singleton): if handler: try: handler(*gui_extension_point_args) - except Exception as e: - log.warning('Error executing %s', handler, - exc_info=True) + except Exception: + log.warning('Error executing %s', + handler, exc_info=True) @log_calls('PluginManager') @@ -579,9 +580,8 @@ class PluginManager(metaclass=Singleton): try: conf.read_file(conf_file) except configparser.Error: - log.warning(("Plugin {plugin} not loaded, error loading" - " manifest").format(plugin=elem_name) - , exc_info=True) + log.warning('Plugin %s not loaded, error loading manifest', + elem_name, exc_info=True) continue min_v = conf.get('info', 'min_gajim_version', fallback=None) @@ -591,32 +591,24 @@ class PluginManager(metaclass=Singleton): gajim_v_cmp = parse_version(gajim_v) if min_v and gajim_v_cmp < parse_version(min_v): - log.warning(('Plugin {plugin} not loaded, newer version of' - 'gajim required: {gajim_v} < {min_v}').format( - plugin=elem_name, - gajim_v=gajim_v, - min_v=min_v - )) + log.warning('Plugin %s not loaded, newer version of' + 'gajim required: %s < %s', + elem_name, gajim_v, min_v) continue if max_v and gajim_v_cmp > parse_version(max_v): - log.warning(('Plugin {plugin} not loaded, plugin incompatible ' - 'with current version of gajim: ' - '{gajim_v} > {max_v}').format( - plugin=elem_name, - gajim_v=gajim_v, - max_v=max_v - )) + log.warning('Plugin %s not loaded, plugin incompatible ' + 'with current version of gajim: ' + '%s > %s', elem_name, gajim_v, max_v) continue module = None try: log.info('Loading %s', module_name) module = __import__(module_name) - except Exception as error: + except Exception: log.warning( - "While trying to load {plugin}, exception occurred".format(plugin=elem_name), - exc_info=sys.exc_info() - ) + 'While trying to load %s, exception occurred', + elem_name, exc_info=True) continue if module is None: @@ -626,7 +618,7 @@ class PluginManager(metaclass=Singleton): for module_attr_name in [attr_name for attr_name in dir(module) if not (attr_name.startswith('__') or attr_name.endswith('__'))]: module_attr = getattr(module, module_attr_name) - log.debug('%s : %s' % (module_attr_name, module_attr)) + log.debug('%s: %s', module_attr_name, module_attr) try: if not issubclass(module_attr, GajimPlugin) or \ @@ -653,16 +645,18 @@ class PluginManager(metaclass=Singleton): pass except configparser.NoOptionError: # all fields are required - log.debug('%s : %s' % (module_attr_name, - 'wrong manifest file. all fields are required!')) + log.debug( + '%s: wrong manifest file. all fields are required!', + module_attr_name) except configparser.NoSectionError: # info section are required - log.debug('%s : %s' % (module_attr_name, - 'wrong manifest file. info section are required!')) + log.debug( + '%s: wrong manifest file. info section are required!', + module_attr_name) except configparser.MissingSectionHeaderError: # info section are required - log.debug('%s : %s' % (module_attr_name, - 'wrong manifest file. section are required!')) + log.debug('%s: wrong manifest file. section are required!', + module_attr_name) sys.path.remove(path) return plugins_found ===================================== 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 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 gajim View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/9bab139bb5bb3f695d14aacd612227020… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/9bab139bb5bb3f695d14aacd612227020… You're receiving this email because of your account on dev.gajim.org.

1 0

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

16 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7bb6f8b2 by Philipp Hörist at 2018-09-16T21:45:01Z Fix bare-except pylint errors - - - - - 9bab139b by Philipp Hörist at 2018-09-16T21:46:16Z Update pylint error list Check for W0702 bare-except - - - - - 13 changed files: - .gitlab-ci.yml - gajim/advanced_configuration_window.py - gajim/common/jingle_rtp.py - gajim/common/jingle_xtls.py - gajim/common/modules/dataforms.py - gajim/common/protocol/bytestream.py - gajim/dev/ipython_view.py - gajim/gtkgui_helpers.py - gajim/gui_interface.py - gajim/htmltextview.py - gajim/plugins/gajimplugin.py - plugins/dbus_plugin/plugin.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,W0621 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 gajim run-build: stage: build ===================================== gajim/advanced_configuration_window.py ===================================== --- a/gajim/advanced_configuration_window.py +++ b/gajim/advanced_configuration_window.py @@ -306,7 +306,7 @@ class AdvancedConfigurationWindow: else: try: value = str(option) - except: + except Exception: value = option self.model.append(parent, [name, value, type_]) ===================================== gajim/common/jingle_rtp.py ===================================== --- a/gajim/common/jingle_rtp.py +++ b/gajim/common/jingle_rtp.py @@ -412,7 +412,7 @@ class JingleVideo(JingleRTPContent): framerate = '' try: w, h = app.config.get('video_size').split('x') - except: + except Exception: w = h = None if w and h: video_size = 'video/x-raw,width=%s,height=%s ! ' % (w, h) ===================================== gajim/common/jingle_xtls.py ===================================== --- a/gajim/common/jingle_xtls.py +++ b/gajim/common/jingle_xtls.py @@ -85,7 +85,7 @@ def load_cert_file(cert_path, cert_store=None): except OpenSSL.crypto.Error as exception_obj: log.warning('Unable to load a certificate from file %s: %s', cert_path, exception_obj.args[0][0][2]) - except: + except Exception: log.warning('Unknown error while loading certificate from file ' '%s', cert_path) begin = -1 ===================================== gajim/common/modules/dataforms.py ===================================== --- a/gajim/common/modules/dataforms.py +++ b/gajim/common/modules/dataforms.py @@ -741,7 +741,7 @@ class MultipleDataForm(DataForm): # def reported(self, record): # try: # self.delChild('reported') -# except: +# except Exception: # pass # # record.setName('reported') ===================================== gajim/common/protocol/bytestream.py ===================================== --- a/gajim/common/protocol/bytestream.py +++ b/gajim/common/protocol/bytestream.py @@ -813,7 +813,7 @@ class ConnectionIBBytestream(ConnectionBytestream): file_props = FilesProp.getFilePropByTransportSid(self.name, sid) try: blocksize = int(blocksize) - except: + except Exception: err = nbxmpp.ERR_BAD_REQUEST if not sid or not blocksize: err = nbxmpp.ERR_BAD_REQUEST ===================================== gajim/dev/ipython_view.py ===================================== --- a/gajim/dev/ipython_view.py +++ b/gajim/dev/ipython_view.py @@ -193,7 +193,7 @@ class IterableIPShell: if self.iter_more: try: self.prompt = self.generatePrompt(True) - except: + except Exception: self.IP.showtraceback() if self.IP.autoindent: self.IP.rl_do_indent = True @@ -203,7 +203,7 @@ class IterableIPShell: except KeyboardInterrupt: self.IP.write('\nKeyboardInterrupt\n') self.IP.input_splitter.reset() - except: + except Exception: self.IP.showtraceback() else: self.IP.input_splitter.push(line) ===================================== gajim/gtkgui_helpers.py ===================================== --- a/gajim/gtkgui_helpers.py +++ b/gajim/gtkgui_helpers.py @@ -37,7 +37,7 @@ import xml.etree.ElementTree as ET try: from PIL import Image -except: +except Exception: pass from io import BytesIO ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -48,7 +48,7 @@ import OpenSSL try: from PIL import Image -except: +except Exception: pass from gajim.common import app @@ -934,7 +934,7 @@ class Interface: h = Hashes2() try: file_ = open(file_props.file_name, 'rb') - except: + except Exception: return hash_ = h.calculateHash(file_props.algo, file_) file_.close() ===================================== gajim/htmltextview.py ===================================== --- a/gajim/htmltextview.py +++ b/gajim/htmltextview.py @@ -283,7 +283,7 @@ class HtmlHandler(xml.sax.handler.ContentHandler): def get_val(min_val=minl, max_val=maxl): try: val = float(value[:-2]) - except: + except Exception: log.warning('Unable to parse length value "%s"', value) return None if val > 0: ===================================== gajim/plugins/gajimplugin.py ===================================== --- a/gajim/plugins/gajimplugin.py +++ b/gajim/plugins/gajimplugin.py @@ -258,7 +258,7 @@ class GajimPluginConfig(): try: self.data = pickle.load(fd) fd.close() - except: + except Exception: fd.close() try: import shelve @@ -269,7 +269,7 @@ class GajimPluginConfig(): raise GajimPluginException s.close() self.save() - except: + except Exception: log.warning('%s plugin config file not readable. Saving it as ' '%s and creating a new one' % (self.plugin.short_name, self.FILE_PATH.decode(locale.getpreferredencoding()) + '.bak')) ===================================== plugins/dbus_plugin/plugin.py ===================================== --- a/plugins/dbus_plugin/plugin.py +++ b/plugins/dbus_plugin/plugin.py @@ -328,7 +328,7 @@ if dbus_support.supported: jid = self._get_real_jid(jid, account) try: jid = helpers.parse_jid(jid) - except: + except Exception: # Jid is not conform, ignore it return DBUS_BOOLEAN(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,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 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 gajim View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b8bbcf2be098e69ce061dfa064bdc8ecc… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b8bbcf2be098e69ce061dfa064bdc8ecc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix missing time attribute
by Philipp Hörist 16 Sep '18

16 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: b8bbcf2b by Philipp Hörist at 2018-09-16T21:33:09Z Fix missing time attribute This was removed by accident - - - - - 1 changed file: - gajim/common/events.py Changes: ===================================== gajim/common/events.py ===================================== --- a/gajim/common/events.py +++ b/gajim/common/events.py @@ -70,6 +70,7 @@ class ChatEvent(Event): self.message = message self.subject = subject self.kind = kind + self.time = time_ self.encrypted = encrypted self.resource = resource self.msg_log_id = msg_log_id View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b8bbcf2be098e69ce061dfa064bdc8ecc3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b8bbcf2be098e69ce061dfa064bdc8ecc3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update .pylintrc
by Philipp Hörist 16 Sep '18

16 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: aaaa3bc9 by Philipp Hörist at 2018-09-16T16:09:24Z Update .pylintrc - - - - - 1 changed file: - pylintrc Changes: ===================================== pylintrc ===================================== --- a/pylintrc +++ b/pylintrc @@ -18,7 +18,7 @@ ignore-patterns= #init-hook= # Use multiple processes to speed up Pylint. -jobs=0 +jobs=2 # List of plugins (as comma separated values of python modules names) to load, # usually to register additional checkers. View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/aaaa3bc9bdd2b733e8db288f3a09245c57… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/aaaa3bc9bdd2b733e8db288f3a09245c57… You're receiving this email because of your account on dev.gajim.org.

1 0

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

16 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: d53b9521 by Philipp Hörist at 2018-09-16T16:04:15Z Fix redefined-outer-name pylint errors - - - - - f6144bff by Philipp Hörist at 2018-09-16T16:04:21Z Update pylint error list Check for W0621 redefined-outer-name - - - - - 18 changed files: - .gitlab-ci.yml - gajim/chat_control_base.py - gajim/command_system/framework.py - gajim/command_system/implementation/standard.py - gajim/common/dbus_support.py - gajim/common/events.py - gajim/common/helpers.py - gajim/common/zeroconf/zeroconf_avahi.py - gajim/disco.py - gajim/gajim.py - gajim/gtk/account_wizard.py - gajim/gtk/util.py - gajim/gtkgui_helpers.py - gajim/htmltextview.py - gajim/music_track_listener.py - gajim/plugins/helpers.py - gajim/vcard.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 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 gajim run-build: stage: build ===================================== gajim/chat_control_base.py ===================================== --- a/gajim/chat_control_base.py +++ b/gajim/chat_control_base.py @@ -711,12 +711,12 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): """ pass - def _on_drag_leave(self, widget, context, time): + def _on_drag_leave(self, *args): # FIXME: DND on non editable TextView, find a better way self.drag_entered = False self.conv_textview.tv.set_editable(False) - def _on_drag_motion(self, widget, context, x, y, time): + def _on_drag_motion(self, *args): # FIXME: DND on non editable TextView, find a better way if not self.drag_entered: # We drag new data over the TextView, make it editable to catch dnd ===================================== gajim/command_system/framework.py ===================================== --- a/gajim/command_system/framework.py +++ b/gajim/command_system/framework.py @@ -96,17 +96,17 @@ class CommandProcessor: return True def execute_command(self, name, arguments): - command = self.get_command(name) + cmd = self.get_command(name) args, opts = parse_arguments(arguments) if arguments else ([], []) - args, kwargs = adapt_arguments(command, arguments, args, opts) + args, kwargs = adapt_arguments(cmd, arguments, args, opts) - if self.command_preprocessor(command, name, arguments, args, kwargs): + if self.command_preprocessor(cmd, name, arguments, args, kwargs): return - value = command(self, *args, **kwargs) - self.command_postprocessor(command, name, arguments, args, kwargs, value) + value = cmd(self, *args, **kwargs) + self.command_postprocessor(cmd, name, arguments, args, kwargs, value) - def command_preprocessor(self, command, name, arguments, args, kwargs): + def command_preprocessor(self, cmd, name, arguments, args, kwargs): """ Redefine this method in the subclass to execute custom code before command gets executed. @@ -116,7 +116,7 @@ class CommandProcessor: """ pass - def command_postprocessor(self, command, name, arguments, args, kwargs, value): + def command_postprocessor(self, cmd, name, arguments, args, kwargs, value): """ Redefine this method in the subclass to execute custom code after command gets executed. @@ -135,10 +135,10 @@ class CommandProcessor: pass def get_command(self, name): - command = get_command(self.COMMAND_HOST, name) - if not command: + cmd = get_command(self.COMMAND_HOST, name) + if not cmd: raise NoCommandError("Command does not exist", name=name) - return command + return cmd def list_commands(self): commands = list_commands(self.COMMAND_HOST) @@ -307,16 +307,16 @@ def command(*names, **properties): Decorator which receives handler as a first argument and then wraps it in the command which then returns back. """ - command = Command(handler, *names, **properties) + cmd = Command(handler, *names, **properties) # Extract and inject a native name if either no other names are # specified or native property is enabled, while making # sure it is going to be the first one in the list. if not names or native: - names.insert(0, command.native_name) - command.names = tuple(names) + names.insert(0, cmd.native_name) + cmd.names = tuple(names) - return command + return cmd # Workaround if we are getting called without parameters. Keep in # mind that in that case - first item in the names will be the ===================================== gajim/command_system/implementation/standard.py ===================================== --- a/gajim/command_system/implementation/standard.py +++ b/gajim/command_system/implementation/standard.py @@ -43,25 +43,25 @@ class StandardCommonCommands(CommandContainer): @command(overlap=True) @doc(_("Show help on a given command or a list of available commands if -a is given")) - def help(self, command=None, all=False): - if command: - command = self.get_command(command) + def help(self, cmd=None, all=False): + if cmd: + cmd = self.get_command(cmd) - documentation = _(command.extract_documentation()) - usage = generate_usage(command) + documentation = _(cmd.extract_documentation()) + usage = generate_usage(cmd) text = [] if documentation: text.append(documentation) - if command.usage: + if cmd.usage: text.append(usage) return '\n\n'.join(text) elif all: - for command in self.list_commands(): - names = ', '.join(command.names) - description = command.extract_description() + for cmd in self.list_commands(): + names = ', '.join(cmd.names) + description = cmd.extract_description() self.echo("%s - %s" % (names, description)) else: ===================================== gajim/common/dbus_support.py ===================================== --- a/gajim/common/dbus_support.py +++ b/gajim/common/dbus_support.py @@ -42,8 +42,8 @@ except ImportError: else: try: # test if dbus-x11 is installed - bus = dbus.SystemBus() - bus = dbus.SessionBus() + _bus = dbus.SystemBus() + _bus = dbus.SessionBus() supported = True # does user have D-Bus bindings? except dbus.DBusException: supported = False ===================================== gajim/common/events.py ===================================== --- a/gajim/common/events.py +++ b/gajim/common/events.py @@ -61,16 +61,15 @@ class Event: class ChatEvent(Event): type_ = 'chat' - def __init__ (self, message, subject, kind, time, encrypted, resource, + def __init__ (self, message, subject, kind, time_, encrypted, resource, msg_log_id, correct_id=None, xhtml=None, session=None, form_node=None, - displaymarking=None, sent_forwarded=False, time_=None, show_in_roster=False, + displaymarking=None, sent_forwarded=False, show_in_roster=False, show_in_systray=True, additional_data=None): Event.__init__(self, time_, show_in_roster=show_in_roster, show_in_systray=show_in_systray) self.message = message self.subject = subject self.kind = kind - self.time = time self.encrypted = encrypted self.resource = resource self.msg_log_id = msg_log_id ===================================== gajim/common/helpers.py ===================================== --- a/gajim/common/helpers.py +++ b/gajim/common/helpers.py @@ -1279,7 +1279,6 @@ def get_subscription_request_msg(account=None): return s def replace_dataform_media(form, stanza): - import nbxmpp found = False for field in form.getTags('field'): for media in field.getTags('media'): ===================================== gajim/common/zeroconf/zeroconf_avahi.py ===================================== --- a/gajim/common/zeroconf/zeroconf_avahi.py +++ b/gajim/common/zeroconf/zeroconf_avahi.py @@ -354,7 +354,7 @@ class Zeroconf: # connect to dbus def connect_dbus(self): try: - import dbus + import dbus # pylint: disable=redefined-outer-name from dbus.mainloop.glib import DBusGMainLoop main_loop = DBusGMainLoop(set_as_default=True) dbus.set_default_main_loop(main_loop) ===================================== gajim/disco.py ===================================== --- a/gajim/disco.py +++ b/gajim/disco.py @@ -2094,11 +2094,11 @@ class DiscussionGroupsBrowser(AgentBrowser): except Exception: return - groups = set() + groups_ = set() for child in subscriptions.getTags('subscription'): - groups.add(child['node']) + groups_.add(child['node']) - self.subscriptions = groups + self.subscriptions = groups_ # try to setup existing items in model model = self.window.services_treeview.get_model() @@ -2108,7 +2108,7 @@ class DiscussionGroupsBrowser(AgentBrowser): # 4 = subscribed? groupnode = row[1] row[3] = False - row[4] = groupnode in groups + row[4] = groupnode in groups_ # we now know subscriptions, update button states self.update_actions() ===================================== gajim/gajim.py ===================================== --- a/gajim/gajim.py +++ b/gajim/gajim.py @@ -38,7 +38,6 @@ def _check_required_deps(): print('Gajim needs python-nbxmpp to run. Quitting…') sys.exit(1) - from distutils.version import LooseVersion as V if V(nbxmpp.__version__) < V(_MIN_NBXMPP_VER): print('Gajim needs python-nbxmpp >= %s to run. ' 'Quitting...' % _MIN_NBXMPP_VER) ===================================== gajim/gtk/account_wizard.py ===================================== --- a/gajim/gtk/account_wizard.py +++ b/gajim/gtk/account_wizard.py @@ -24,11 +24,12 @@ from gajim.common import configpaths from gajim.common import helpers from gajim.common import connection from gajim.common.modules import dataforms +from gajim.config import ManageProxiesWindow +from gajim.config import FakeDataForm from gajim.gtk.util import get_builder from gajim.gtk import ErrorDialog from gajim import gtkgui_helpers from gajim import dataforms_widget -from gajim import config from gajim import gui_menu_builder @@ -347,7 +348,7 @@ class AccountCreationWizard: app.interface.instances['manage_proxies'].window.present() else: app.interface.instances['manage_proxies'] = \ - config.ManageProxiesWindow() + ManageProxiesWindow() def on_custom_host_port_checkbutton_toggled(self, widget): self.xml.get_object('custom_host_hbox').set_sensitive( @@ -377,8 +378,7 @@ class AccountCreationWizard: self.data_form_widget.set_data_form(dataform) empty_config = False else: - self.data_form_widget = config.FakeDataForm( - obj.config, selectable=True) + self.data_form_widget = FakeDataForm(obj.config, selectable=True) for field in obj.config: if field in ('key', 'instructions', 'x', 'registered'): continue ===================================== gajim/gtk/util.py ===================================== --- a/gajim/gtk/util.py +++ b/gajim/gtk/util.py @@ -198,8 +198,7 @@ def at_the_end(widget): """ adj_v = widget.get_vadjustment() max_scroll_pos = adj_v.get_upper() - adj_v.get_page_size() - at_the_end = (adj_v.get_value() == max_scroll_pos) - return at_the_end + return adj_v.get_value() == max_scroll_pos def get_image_button(icon_name, tooltip, toggle=False): ===================================== gajim/gtkgui_helpers.py ===================================== --- a/gajim/gtkgui_helpers.py +++ b/gajim/gtkgui_helpers.py @@ -211,8 +211,7 @@ def at_the_end(widget): """ adj_v = widget.get_vadjustment() max_scroll_pos = adj_v.get_upper() - adj_v.get_page_size() - at_the_end = (adj_v.get_value() == max_scroll_pos) - return at_the_end + return adj_v.get_value() == max_scroll_pos def scroll_to_end(widget): """Scrolls to the end of a GtkScrolledWindow. ===================================== gajim/htmltextview.py ===================================== --- a/gajim/htmltextview.py +++ b/gajim/htmltextview.py @@ -72,7 +72,7 @@ classes = { } # styles for elements -element_styles = { +_element_styles = { 'u' : ';text-decoration: underline', 'em' : ';font-style: oblique', 'cite' : '; background-color:rgb(170,190,250);' @@ -90,12 +90,12 @@ element_styles = { 'dd' : ';margin-left: 2em; font-style: oblique' } # no difference for the moment -element_styles['dfn'] = element_styles['em'] -element_styles['var'] = element_styles['em'] +_element_styles['dfn'] = _element_styles['em'] +_element_styles['var'] = _element_styles['em'] # deprecated, legacy, presentational -element_styles['tt'] = element_styles['kbd'] -element_styles['i'] = element_styles['em'] -element_styles['b'] = element_styles['strong'] +_element_styles['tt'] = _element_styles['kbd'] +_element_styles['i'] = _element_styles['em'] +_element_styles['b'] = _element_styles['strong'] # ========== # XEP-0071 @@ -182,12 +182,12 @@ 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]) - header_size = (num-1) // 2 - weight = (num - 1) % 2 - element_styles[name] = '; font-size: %s; %s' % ( ('large', 'medium', 'small')[header_size], - ('font-weight: bold', 'font-style: oblique')[weight],) +for _name in BLOCK_HEAD: + _num = eval(_name[1]) + _header_size = (_num - 1) // 2 + _weight = (_num - 1) % 2 + _element_styles[_name] = '; font-size: %s; %s' % ( ('large', 'medium', 'small')[_header_size], + ('font-weight: bold', 'font-style: oblique')[_weight],) def _parse_css_color(color): if color.startswith('rgb(') and color.endswith(')'): @@ -741,8 +741,8 @@ class HtmlHandler(xml.sax.handler.ContentHandler): style += ';margin-left: 2em' elif name == 'img': tag = self._process_img(attrs) - if name in element_styles: - style += element_styles[name] + if name in _element_styles: + style += _element_styles[name] # so that explicit styles override implicit ones, # we add the attribute last style += ";"+attrs.get('style', '') @@ -915,8 +915,8 @@ class HtmlTextView(Gtk.TextView): AddNewContactWindow(self.account, jid) def make_link_menu(self, event, kind, text): - xml = get_builder('chat_context_menu.ui') - menu = xml.get_object('chat_context_menu') + ui = get_builder('chat_context_menu.ui') + menu = ui.get_object('chat_context_menu') childs = menu.get_children() if kind == 'url': childs[0].connect('activate', self.on_copy_link_activate, text) @@ -930,7 +930,7 @@ class HtmlTextView(Gtk.TextView): childs[7].hide() # add to roster else: # It's a mail or a JID # load muc icon - join_group_chat_menuitem = xml.get_object('join_group_chat_menuitem') + join_group_chat_menuitem = ui.get_object('join_group_chat_menuitem') text = text.lower() if text.startswith('xmpp:'): @@ -1270,9 +1270,9 @@ hhx4dbgYKAAA7' alt='Larry'/> frame.set_shadow_type(Gtk.ShadowType.IN) frame.show() frame.add(sw) - w = Gtk.Window() - w.add(frame) - w.set_default_size(400, 300) - w.show_all() - w.connect('destroy', lambda w: Gtk.main_quit()) + win = Gtk.Window() + win.add(frame) + win.set_default_size(400, 300) + win.show_all() + win.connect('destroy', lambda win: Gtk.main_quit()) Gtk.main() ===================================== gajim/music_track_listener.py ===================================== --- a/gajim/music_track_listener.py +++ b/gajim/music_track_listener.py @@ -199,7 +199,7 @@ class MusicTrackListener(GObject.GObject): # here we test :) if __name__ == '__main__': - def music_track_change_cb(listener, music_track_info): + def music_track_change_cb(_listener, music_track_info): if music_track_info is None or music_track_info.paused: print('Stop!') else: ===================================== gajim/plugins/helpers.py ===================================== --- a/gajim/plugins/helpers.py +++ b/gajim/plugins/helpers.py @@ -51,7 +51,7 @@ class log_calls: even though `log_calls` decorator is used. ''' - def __init__(self, classname='', log=log): + def __init__(self, classname=''): ''' :Keywords: classname : str ===================================== gajim/vcard.py ===================================== --- a/gajim/vcard.py +++ b/gajim/vcard.py @@ -278,7 +278,7 @@ class VcardWindow: return i = 0 client = '' - os = '' + os_info = '' while i in self.os_info: if self.os_info[i]['resource'] == obj.jid.getResource(): if obj.client_info: @@ -296,13 +296,13 @@ class VcardWindow: self.os_info[i]['os'] = Q_('?OS:Unknown') if i > 0: client += '\n' - os += '\n' + os_info += '\n' client += self.os_info[i]['client'] - os += self.os_info[i]['os'] + os_info += self.os_info[i]['os'] i += 1 self.xml.get_object('client_name_version_label').set_text(client) - self.xml.get_object('os_label').set_text(os) + self.xml.get_object('os_label').set_text(os_info) self.os_info_arrived = True def set_entity_time(self, obj): ===================================== 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 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 gajim View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/adc94bdcc6a51398fdd7ab84cbbd528e4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/adc94bdcc6a51398fdd7ab84cbbd528e4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Fix evaluation for subject change
by Philipp Hörist 16 Sep '18

16 Sep '18

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/b4ac6db9b9048ae549616a65896e4a28f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b4ac6db9b9048ae549616a65896e4a28f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update pre-push-tests.sh
by Philipp Hörist 16 Sep '18

16 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: b4ac6db9 by Philipp Hörist at 2018-09-16T12:19:48Z Update pre-push-tests.sh - - - - - 1 changed file: - scripts/dev/pre-push-tests.sh Changes: ===================================== scripts/dev/pre-push-tests.sh ===================================== --- a/scripts/dev/pre-push-tests.sh +++ b/scripts/dev/pre-push-tests.sh @@ -1,4 +1,2 @@ -cd .. -cd .. 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 View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b4ac6db9b9048ae549616a65896e4a28f8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b4ac6db9b9048ae549616a65896e4a28f8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add a pre-push script
by Philipp Hörist 16 Sep '18

16 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: d19ca811 by Philipp Hörist at 2018-09-16T12:15:38Z Add a pre-push script Run this before every push to simulate the CI regarding mypy and pylint - - - - - 1 changed file: - + scripts/dev/pre-push-tests.sh Changes: ===================================== scripts/dev/pre-push-tests.sh ===================================== --- /dev/null +++ b/scripts/dev/pre-push-tests.sh @@ -0,0 +1,4 @@ +cd .. +cd .. +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 View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d19ca8113a4d6a2310d68515d9865b6549… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d19ca8113a4d6a2310d68515d9865b6549… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Dont retract pep items on UserXEPs
by Philipp Hörist 16 Sep '18

16 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7018d5be by Philipp Hörist at 2018-09-16T11:35:55Z Dont retract pep items on UserXEPs This leads to multiple problems 1. We cant assume only items with id='current' are stored in the node which would lead to retracting 'current' but another item would become the last published and sent to users 2. Even if we have a SingletonNode retracting the only item means the Node would be empty and offline clients would not receive the last published item on coming online, because there is no item anymore Instead we always publish an empty item from now on - - - - - 6 changed files: - gajim/common/const.py - gajim/common/modules/pep.py - gajim/common/modules/user_avatar.py - gajim/common/types.py - gajim/gtk/profile.py - gajim/roster_window.py Changes: ===================================== gajim/common/const.py ===================================== --- a/gajim/common/const.py +++ b/gajim/common/const.py @@ -163,12 +163,6 @@ class BookmarkStorageType(IntEnum): @unique -class PEPHandlerType(IntEnum): - NOTIFY = 0 - RETRACT = 1 - - -@unique class PEPEventType(IntEnum): ABSTRACT = 0 ACTIVITY = 1 ===================================== gajim/common/modules/pep.py ===================================== --- a/gajim/common/modules/pep.py +++ b/gajim/common/modules/pep.py @@ -26,11 +26,10 @@ import nbxmpp from gajim.common import app from gajim.common.exceptions import StanzaMalformed from gajim.common.nec import NetworkIncomingEvent -from gajim.common.const import PEPHandlerType, PEPEventType +from gajim.common.const import PEPEventType from gajim.common.types import ConnectionT from gajim.common.types import PEPHandlersDict # pylint: disable=unused-import from gajim.common.types import PEPNotifyCallback -from gajim.common.types import PEPRetractCallback log = logging.getLogger('gajim.c.m.pep') @@ -64,18 +63,16 @@ class PEP: def register_pep_handler( self, namespace: str, - notify_handler: PEPNotifyCallback, - retract_handler: PEPRetractCallback) -> None: + notify_handler: PEPNotifyCallback) -> None: if namespace in self._pep_handlers: - self._pep_handlers[namespace].append( - (notify_handler, retract_handler)) + self._pep_handlers[namespace].append(notify_handler) else: - self._pep_handlers[namespace] = [(notify_handler, retract_handler)] - if notify_handler: - module_instance = notify_handler.__self__ # type: ignore - if module_instance.store_publish: - if module_instance not in self._store_publish_modules: - self._store_publish_modules.append(module_instance) + self._pep_handlers[namespace] = [notify_handler] + + module_instance = notify_handler.__self__ # type: ignore + if module_instance.store_publish: + if module_instance not in self._store_publish_modules: + self._store_publish_modules.append(module_instance) def _pep_event_received(self, _con: ConnectionT, @@ -105,9 +102,9 @@ class PEP: # Check if this is a retraction retract = items.getTag('retract') if retract is not None: - for handler in handlers: - handler[PEPHandlerType.RETRACT](jid, retract.getAttr('id')) - raise nbxmpp.NodeProcessed + id_ = retract.getAttr('id') + log.info('Received retract of id: %s', id_) + raise nbxmpp.NodeProcessed # Check if we have items items_ = items.getTags('item') @@ -115,7 +112,7 @@ class PEP: log.warning('Malformed PEP event received: %s', stanza) raise nbxmpp.NodeProcessed for handler in handlers: - handler[PEPHandlerType.NOTIFY](jid, items_[0]) + handler(jid, items_[0]) raise nbxmpp.NodeProcessed def send_stored_publish(self) -> None: @@ -165,9 +162,7 @@ class AbstractPEPModule: self._stored_publish = None self._con.get_module('PEP').register_pep_handler( - self.namespace, - self._pep_notify_received, - self._pep_retract_received) + self.namespace, self._pep_notify_received) def _pep_notify_received(self, jid: nbxmpp.JID, item: nbxmpp.Node) -> None: try: @@ -177,11 +172,14 @@ class AbstractPEPModule: return self._log.info('Received: %s %s', jid, data) - self._push_event(jid, self.pep_class(data)) - - def _pep_retract_received(self, jid: nbxmpp.JID, id_: str) -> None: - self._log.info('Retract: %s %s', jid, id_) - self._push_event(jid, self.pep_class(None)) + user_pep = self.pep_class(data) + self._notification_received(jid, user_pep) + app.nec.push_incoming_event( + PEPReceivedEvent(None, + conn=self._con, + jid=str(jid), + pep_type=self.name, + user_pep=user_pep)) def _extract_info(self, item: nbxmpp.Node) -> Any: '''To be implemented by subclasses''' @@ -191,14 +189,6 @@ class AbstractPEPModule: '''To be implemented by subclasses''' raise NotImplementedError - def _push_event(self, jid: nbxmpp.JID, user_pep: Any) -> None: - self._notification_received(jid, user_pep) - app.nec.push_incoming_event( - PEPReceivedEvent(None, conn=self._con, - jid=str(jid), - pep_type=self.name, - user_pep=user_pep)) - def _notification_received(self, jid: nbxmpp.JID, user_pep: Any) -> None: for contact in app.contacts.get_contacts(self._account, str(jid)): if user_pep: @@ -241,13 +231,6 @@ class AbstractPEPModule: self._con.get_module('PubSub').send_pb_publish( '', self.namespace, item, 'current') - def retract(self) -> None: - if not self._con.get_module('PEP').supported: - return - self.send(None) - self._con.get_module('PubSub').send_pb_retract( - '', self.namespace, 'current') - class PEPReceivedEvent(NetworkIncomingEvent): name = 'pep-received' ===================================== gajim/common/modules/user_avatar.py ===================================== --- a/gajim/common/modules/user_avatar.py +++ b/gajim/common/modules/user_avatar.py @@ -152,10 +152,6 @@ class UserAvatar(AbstractPEPModule): # Not implemented yet return - def retract(self): - # Not implemented yet - return - def get_instance(*args, **kwargs): return UserAvatar(*args, **kwargs), 'UserAvatar' ===================================== gajim/common/types.py ===================================== --- a/gajim/common/types.py +++ b/gajim/common/types.py @@ -40,8 +40,7 @@ UserTuneDataT = Optional[Tuple[str, str, str, str, str]] # PEP PEPNotifyCallback = Callable[[nbxmpp.JID, nbxmpp.Node], None] -PEPRetractCallback = Callable[[nbxmpp.JID, str], None] -PEPHandlersDict = Dict[str, List[Tuple[PEPNotifyCallback, PEPRetractCallback]]] +PEPHandlersDict = Dict[str, List[PEPNotifyCallback]] # Configpaths PathTuple = Tuple[Optional[PathLocation], str, Optional[PathType]] ===================================== gajim/gtk/profile.py ===================================== --- a/gajim/gtk/profile.py +++ b/gajim/gtk/profile.py @@ -331,11 +331,9 @@ class ProfileWindow(Gtk.ApplicationWindow): transient_for=self) return vcard_, sha = self.make_vcard() - nick = vcard_.get('NICKNAME') - if nick: - app.connections[self.account].get_module('UserNickname').send(nick) - else: - app.connections[self.account].get_module('UserNickname').retract() + nick = vcard_.get('NICKNAME') or None + app.connections[self.account].get_module('UserNickname').send(nick) + if not nick: nick = app.config.get_per('accounts', self.account, 'name') app.nicks[self.account] = nick app.connections[self.account].get_module('VCardTemp').send_vcard( ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -2119,14 +2119,14 @@ class RosterWindow: connection.get_module('UserActivity').send( (activity, subactivity, activity_text)) else: - connection.get_module('UserActivity').retract() + connection.get_module('UserActivity').send(None) if 'mood' in pep_dict: mood = pep_dict['mood'] mood_text = pep_dict.get('mood_text', None) connection.get_module('UserMood').send((mood, mood_text)) else: - connection.get_module('UserMood').retract() + connection.get_module('UserMood').send(None) def delete_pep(self, jid, account): if jid == app.get_jid_from_account(account): @@ -3631,7 +3631,7 @@ class RosterWindow: if active: app.interface.enable_music_listener() else: - app.connections[account].get_module('UserTune').retract() + app.connections[account].get_module('UserTune').send(None) # disable music listener only if no other account uses it for acc in app.connections: if app.config.get_per('accounts', acc, 'publish_tune'): @@ -3647,7 +3647,7 @@ class RosterWindow: if active: location_listener.enable() else: - app.connections[account].get_module('UserLocation').retract() + app.connections[account].get_module('UserLocation').send(None) helpers.update_optional_features(account) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7018d5be0ee93eeb25b1bf45d91fd4507d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7018d5be0ee93eeb25b1bf45d91fd4507d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix sending empty pep data
by Philipp Hörist 16 Sep '18

16 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: e85bc52c by Philipp Hörist at 2018-09-16T10:58:37Z Fix sending empty pep data - - - - - 5 changed files: - gajim/common/modules/pep.py - gajim/common/modules/user_activity.py - gajim/common/modules/user_mood.py - gajim/common/modules/user_nickname.py - gajim/gtk/profile.py Changes: ===================================== gajim/common/modules/pep.py ===================================== --- a/gajim/common/modules/pep.py +++ b/gajim/common/modules/pep.py @@ -106,7 +106,7 @@ class PEP: retract = items.getTag('retract') if retract is not None: for handler in handlers: - handler[PEPHandlerType.RETRACT](jid, retract.getID()) + handler[PEPHandlerType.RETRACT](jid, retract.getAttr('id')) raise nbxmpp.NodeProcessed # Check if we have items ===================================== gajim/common/modules/user_activity.py ===================================== --- a/gajim/common/modules/user_activity.py +++ b/gajim/common/modules/user_activity.py @@ -89,7 +89,7 @@ class UserActivity(AbstractPEPModule): def _build_node(self, data): item = nbxmpp.Node('activity', {'xmlns': self.namespace}) if data is None: - return + return item activity, subactivity, message = data if activity: i = item.addChild(activity) ===================================== gajim/common/modules/user_mood.py ===================================== --- a/gajim/common/modules/user_mood.py +++ b/gajim/common/modules/user_mood.py @@ -88,7 +88,7 @@ class UserMood(AbstractPEPModule): def _build_node(self, data: Optional[Tuple[str, str]]) -> nbxmpp.Node: item = nbxmpp.Node('mood', {'xmlns': nbxmpp.NS_MOOD}) if data is None: - return + return item mood, text = data if mood: item.addChild(mood) ===================================== gajim/common/modules/user_nickname.py ===================================== --- a/gajim/common/modules/user_nickname.py +++ b/gajim/common/modules/user_nickname.py @@ -67,9 +67,8 @@ class UserNickname(AbstractPEPModule): def _build_node(self, data: Optional[str]) -> Optional[nbxmpp.Node]: item = nbxmpp.Node('nick', {'xmlns': nbxmpp.NS_NICK}) - if data is None: - return None - item.addData(data) + if data is not None: + item.addData(data) return item def _notification_received(self, ===================================== gajim/gtk/profile.py ===================================== --- a/gajim/gtk/profile.py +++ b/gajim/gtk/profile.py @@ -331,11 +331,10 @@ class ProfileWindow(Gtk.ApplicationWindow): transient_for=self) return vcard_, sha = self.make_vcard() - nick = '' - if 'NICKNAME' in vcard_: - nick = vcard_['NICKNAME'] + nick = vcard_.get('NICKNAME') + if nick: app.connections[self.account].get_module('UserNickname').send(nick) - if nick == '': + else: app.connections[self.account].get_module('UserNickname').retract() nick = app.config.get_per('accounts', self.account, 'name') app.nicks[self.account] = nick View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e85bc52c8bf3200689400e571992aade4c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e85bc52c8bf3200689400e571992aade4c… 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