Commits

commits@gajim.org

17632 discussions

[Git][gajim/python-nbxmpp][master] Replace deprecated test command
by Philipp Hörist 11 Mar '20

11 Mar '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: d64c9416 by André Apitzsch at 2020-03-10T23:54:58+01:00 Replace deprecated test command Setuptools 41.5.0 deprecated the command. - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -8,7 +8,7 @@ stages: run-test: stage: test script: - - python3 setup.py test + - python3 -m unittest discover -v run-build: stage: build View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/d64c941613c5a61301d61bbe… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/d64c941613c5a61301d61bbe… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 4 commits: Fix pylint errors
by Philipp Hörist 10 Mar '20

10 Mar '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 656aa457 by lovetox at 2020-03-10T22:28:02+01:00 Fix pylint errors - inconsistent-return-statements - - - - - 224b3635 by lovetox at 2020-03-10T22:29:46+01:00 Remove require_version() check We do this already in __init__.py - - - - - eabe1064 by lovetox at 2020-03-10T22:52:47+01:00 Muclumbus: Call callback also on error The method retuned instead of calling the callback - - - - - 24e1bf2c by lovetox at 2020-03-10T23:20:09+01:00 Fix pylint errors - no-else-return - pointless-string-statement - multiple-statements - unused-variable - wrong-import-position - - - - - 21 changed files: - nbxmpp/__init__.py - nbxmpp/c14n.py - nbxmpp/idlequeue.py - nbxmpp/modules/activity.py - nbxmpp/modules/bookmarks.py - nbxmpp/modules/dataforms.py - nbxmpp/modules/date_and_time.py - nbxmpp/modules/location.py - nbxmpp/modules/muc.py - nbxmpp/modules/muclumbus.py - nbxmpp/modules/nickname.py - nbxmpp/modules/openpgp.py - nbxmpp/modules/pubsub.py - nbxmpp/modules/tune.py - nbxmpp/old_dispatcher.py - nbxmpp/plugin.py - nbxmpp/protocol.py - nbxmpp/simplexml.py - nbxmpp/stringprepare.py - nbxmpp/structs.py - nbxmpp/third_party/hsluv.py Changes: ===================================== nbxmpp/__init__.py ===================================== @@ -1,6 +1,7 @@ import gi -gi.require_version('Soup', '2.4') from .protocol import * +gi.require_version('Soup', '2.4') + __version__ = "0.9.94" ===================================== nbxmpp/c14n.py ===================================== @@ -1,4 +1,3 @@ -# -*- coding:utf-8 -*- ## c14n.py ## ## Copyright (C) 2007-2008 Brendan Taylor <whateley AT gmail.com> @@ -43,7 +42,8 @@ def c14n(node, is_buggy): s = s + normalise_text(node.data[cnt]) s = s + c14n(a, is_buggy) cnt += 1 - if (len(node.data)-1) >= cnt: s = s + normalise_text(node.data[cnt]) + if (len(node.data)-1) >= cnt: + s = s + normalise_text(node.data[cnt]) if not node.kids and s.endswith('>'): s=s[:-1]+' />' else: ===================================== nbxmpp/idlequeue.py ===================================== @@ -65,13 +65,12 @@ def get_idlequeue(): if os.name == 'nt': # gobject.io_add_watch does not work on windows return SelectIdleQueue() - else: - if HAVE_GLIB: - # Gajim's default Idlequeue - return GlibIdleQueue() - else: - # GUI less implementation - return SelectIdleQueue() + + if HAVE_GLIB: + # Gajim's default Idlequeue + return GlibIdleQueue() + # GUI less implementation + return SelectIdleQueue() class IdleObject: @@ -197,12 +196,13 @@ class IdleCommand(IdleObject): def pollin(self): try: res = self.pipe.read() - except Exception as e: + except Exception: res = '' if res == '': return self.pollend() - else: - self.result += res + + self.result += res + return None def read_timeout(self): self.end() @@ -274,8 +274,8 @@ class IdleQueue: if not self.alarms[alarm_time]: del self.alarms[alarm_time] return True - else: - return False + + return False def remove_timeout(self, fd, timeout=None): """ @@ -448,8 +448,8 @@ class SelectIdleQueue(IdleQueue): union.update(self.error_fds) for fd in (union.keys()): try: - status = os.stat(fd) - except OSError as e: + _status = os.stat(fd) + except OSError: # This file descriptor is invalid. Add to list for closure. bad_fds.append(fd) ===================================== nbxmpp/modules/activity.py ===================================== @@ -81,6 +81,7 @@ class Activity: for sub in activity.getChildren(): if sub.getName() in sub_activities: return sub.getName() + return None def set_activity(self, data): item = Node('activity', {'xmlns': NS_ACTIVITY}) ===================================== nbxmpp/modules/bookmarks.py ===================================== @@ -168,20 +168,20 @@ class Bookmarks: jid = item.getAttr('id') if jid is None: log.warning('No id attr found') - return + return None try: jid = JID(jid) except Exception as error: log.warning('Invalid JID: %s', error) log.warning(item) - return + return None conference = item.getTag('conference', namespace=NS_BOOKMARKS_2) if conference is None: log.warning('No conference node found') log.warning(item) - return + return None autojoin = conference.getAttr('autojoin') in ('True', 'true', '1') name = conference.getAttr('name') @@ -215,6 +215,7 @@ class Bookmarks: if type_ == BookmarkStoreType.PRIVATE: log.info('Request bookmarks (Private Storage)') return self.get_private_request(), {'type_': type_} + return None @callback def _bookmarks_received(self, stanza, type_): @@ -418,3 +419,4 @@ class Bookmarks: def _on_private_store_result(_client, stanza): if not isResultNode(stanza): return raise_error(log.info, stanza) + return None ===================================== nbxmpp/modules/dataforms.py ===================================== @@ -227,6 +227,7 @@ class DataField(ExtendedNode): media = self.getTag('media', namespace=NS_DATA_MEDIA) if media: return Media(media) + return None @media.setter def media(self, value): ===================================== nbxmpp/modules/date_and_time.py ===================================== @@ -108,19 +108,19 @@ def create_tzinfo(hours=0, minutes=0, tz_string=None): hours, minutes = map(int, tz_string.split(':')) except Exception: log.warning('Wrong tz string: %s', tz_string) - return + return None if hours not in range(-24, 24): log.warning('Wrong tz string: %s', tz_string) - return + return None if minutes not in range(0, 59): log.warning('Wrong tz string: %s', tz_string) - return + return None if hours in (24, -24) and minutes != 0: log.warning('Wrong tz string: %s', tz_string) - return + return None return timezone(timedelta(hours=hours, minutes=minutes)) ===================================== nbxmpp/modules/location.py ===================================== @@ -66,7 +66,7 @@ class Location: def set_location(self, data): item = Node('geoloc', {'xmlns': NS_LOCATION}) if data is None: - return item + return data = data._asdict() for tag, value in data: ===================================== nbxmpp/modules/muc.py ===================================== @@ -531,23 +531,25 @@ class MUC: @staticmethod def _parse_muc_user(muc_user): item = muc_user.getTag('item') - if item is not None: - item_dict = item.getAttrs(copy=True) - if 'role' in item_dict: - item_dict['role'] = Role(item_dict['role']) - else: - item_dict['role'] = None - - if 'affiliation' in item_dict: - item_dict['affiliation'] = Affiliation(item_dict['affiliation']) - else: - item_dict['affiliation'] = None - - if 'jid' in item_dict: - item_dict['jid'] = JID(item_dict['jid']) - else: - item_dict['jid'] = None - - item_dict['actor'] = item.getTagAttr('actor', 'nick') - item_dict['reason'] = item.getTagData('reason') - return MucUserData(**item_dict) + if item is None: + return None + + item_dict = item.getAttrs(copy=True) + if 'role' in item_dict: + item_dict['role'] = Role(item_dict['role']) + else: + item_dict['role'] = None + + if 'affiliation' in item_dict: + item_dict['affiliation'] = Affiliation(item_dict['affiliation']) + else: + item_dict['affiliation'] = None + + if 'jid' in item_dict: + item_dict['jid'] = JID(item_dict['jid']) + else: + item_dict['jid'] = None + + item_dict['actor'] = item.getTagAttr('actor', 'nick') + item_dict['reason'] = item.getTagData('reason') + return MucUserData(**item_dict) ===================================== nbxmpp/modules/muclumbus.py ===================================== @@ -18,8 +18,6 @@ import logging import json -import gi -gi.require_version('Soup', '2.4') from gi.repository import Soup from nbxmpp.protocol import NS_MUCLUMBUS @@ -160,27 +158,33 @@ class Muclumbus: items=results) def _http_search_received(self, _session, message, callback, user_data): + + def exec_callback(muclumbus_result): + if user_data is None: + callback(muclumbus_result) + else: + callback(muclumbus_result, user_data) + soup_body = message.get_property('response-body') if message.status_code != 200: log.warning(soup_body.data) - return MuclumbusResult(first=None, - last=None, - max=None, - end=True, - items=[]) - + exec_callback(MuclumbusResult(first=None, + last=None, + max=None, + end=True, + items=[])) response = json.loads(soup_body.data) result = response['result'] items = result.get('items') if items is None: - return MuclumbusResult(first=None, - last=None, - max=None, - end=True, - items=[]) + exec_callback(MuclumbusResult(first=None, + last=None, + max=None, + end=True, + items=[])) results = [] for item in items: @@ -198,13 +202,8 @@ class Muclumbus: is_open=item['is_open'], anonymity_mode=anonymity_mode)) - muclumbus_result = MuclumbusResult(first=None, - last=result['last'], - max=None, - end=not result['more'], - items=results) - - if user_data is None: - callback(muclumbus_result) - else: - callback(muclumbus_result, user_data) + exec_callback(MuclumbusResult(first=None, + last=result['last'], + max=None, + end=not result['more'], + items=results)) ===================================== nbxmpp/modules/nickname.py ===================================== @@ -81,7 +81,7 @@ class Nickname: def _parse_nickname(stanza): nickname = stanza.getTag('nick', namespace=NS_NICK) if nickname is None: - return + return None return nickname.getData() or None def set_nickname(self, nickname): ===================================== nbxmpp/modules/openpgp.py ===================================== @@ -81,13 +81,7 @@ class OpenPGP: return def _process_pubsub_openpgp(self, _client, stanza, properties): - if not properties.is_pubsub_event: - return - - if properties.pubsub_event.node != NS_OPENPGP_PK: - return - - ''' + """ <item> <public-keys-list xmlns='urn:xmpp:openpgp:0'> <pubkey-metadata @@ -99,8 +93,15 @@ class OpenPGP: date='1953-05-16T12:00:00Z' /> </public-keys-list> - </item> - ''' + </item> + """ + + if not properties.is_pubsub_event: + return + + if properties.pubsub_event.node != NS_OPENPGP_PK: + return + item = properties.pubsub_event.item if item is None: # Retract, Deleted or Purged ===================================== nbxmpp/modules/pubsub.py ===================================== @@ -214,10 +214,11 @@ def get_pubsub_items(stanza, node=None): pubsub_node = stanza.getTag('pubsub') items_node = pubsub_node.getTag('items') if node is not None and items_node.getAttr('node') != node: - return + return None if items_node is not None: return items_node.getTags('item') + return None def get_publish_options(config): ===================================== nbxmpp/modules/tune.py ===================================== @@ -67,7 +67,7 @@ class Tune: def set_tune(self, data): item = Node('tune', {'xmlns': NS_TUNE}) if data is None: - return item + return data = data._asdict() for tag, value in data.items(): ===================================== nbxmpp/old_dispatcher.py ===================================== @@ -319,7 +319,7 @@ class XMPPDispatcher(PlugIn): if len(self._pendingExceptions) > 0: _pendingException = self._pendingExceptions.pop() sys.excepthook(*_pendingException) - return + return None try: self.Stream.Parse(data) # end stream:stream tag received @@ -338,7 +338,7 @@ class XMPPDispatcher(PlugIn): if len(self._pendingExceptions) > 0: _pendingException = self._pendingExceptions.pop() sys.excepthook(*_pendingException) - return + return None if len(data) == 0: return '0' return len(data) ===================================== nbxmpp/plugin.py ===================================== @@ -45,7 +45,7 @@ class PlugIn: log.info('Plugging %s __INTO__ %s' % (self, self._owner)) if self.__class__.__name__ in owner.__dict__: log.debug('Plugging ignored: another instance already plugged.') - return + return None self._old_owners_methods=[] for method in self._exported_methods: if method.__name__ in owner.__dict__: @@ -61,6 +61,7 @@ class PlugIn: # Execute hook if hasattr(self, 'plugin'): return self.plugin(owner, *args, **kwargs) + return None def PlugOut(self, *args, **kwargs): """ @@ -82,6 +83,7 @@ class PlugIn: if hasattr(self, 'plugout'): return self.plugout(*args, **kwargs) del self._owner + return None @classmethod def get_instance(cls, *args, **kwargs): ===================================== nbxmpp/protocol.py ===================================== @@ -967,6 +967,7 @@ class StreamErrorNode(Node): for tag in self.getChildren(): if tag.getName() != 'text' and tag.getNamespace() == NS_XMPP_STREAMS: return tag.getName() + return None def get_text(self, pref_lang=None): if pref_lang is not None: @@ -1047,7 +1048,8 @@ class Protocol(Node): try: return self['to'] except: - return None + pass + return None def getFrom(self): """ @@ -1056,7 +1058,8 @@ class Protocol(Node): try: return self['from'] except: - return None + pass + return None def getTimestamp(self): """ @@ -1126,26 +1129,29 @@ class Protocol(Node): """ errtag = self.getTag('error') if errtag is None: - return + return None for tag in errtag.getChildren(): if tag.getName() != 'text' and tag.getNamespace() == NS_STANZAS: return tag.getName() + return None def getAppError(self): errtag = self.getTag('error') if errtag is None: - return + return None for tag in errtag.getChildren(): if tag.getName() != 'text' and tag.getNamespace() != NS_STANZAS: return tag.getName() + return None def getAppErrorNamespace(self): errtag = self.getTag('error') if errtag is None: - return + return None for tag in errtag.getChildren(): if tag.getName() != 'text' and tag.getNamespace() != NS_STANZAS: return tag.getNamespace() + return None def getErrorMsg(self): """ @@ -1158,6 +1164,7 @@ class Protocol(Node): if tag.getName() == 'text': return tag.getData() return self.getError() + return None def getErrorCode(self): """ @@ -1231,8 +1238,7 @@ class Protocol(Node): if protocol and tag: if name == 'message': return Message(node=tag) - else: - return Protocol(node=tag) + return Protocol(node=tag) return tag def __setitem__(self, item, val): @@ -1546,6 +1552,7 @@ class Iq(Protocol): if children and self.getType() != 'error' and \ children[0].getName() != 'error': return children[0] + return None def getQueryNS(self): """ @@ -1554,6 +1561,7 @@ class Iq(Protocol): tag = self.getQuery() if tag: return tag.getNamespace() + return None def getQuerynode(self): """ @@ -1562,6 +1570,7 @@ class Iq(Protocol): tag = self.getQuery() if tag: return tag.getAttr('node') + return None def getQueryPayload(self): """ @@ -1570,6 +1579,7 @@ class Iq(Protocol): tag = self.getQuery() if tag: return tag.getPayload() + return None def getQueryChildren(self): """ @@ -1578,6 +1588,7 @@ class Iq(Protocol): tag = self.getQuery() if tag: return tag.getChildren() + return None def getQueryChild(self, name=None): """ @@ -1586,7 +1597,7 @@ class Iq(Protocol): """ query = self.getQuery() if not query: - return + return None for node in query.getChildren(): if name is not None: if node.getName() == name: @@ -1594,6 +1605,7 @@ class Iq(Protocol): else: if node.getName() != 'error': return node + return None def setQuery(self, name=None): """ @@ -1639,9 +1651,7 @@ class Iq(Protocol): class Hashes(Node): """ Hash elements for various XEPs as defined in XEP-300 - """ - """ RECOMENDED HASH USE: Algorithm Support MD2 MUST NOT @@ -1701,9 +1711,7 @@ class Hashes(Node): class Hashes2(Node): """ Hash elements for various XEPs as defined in XEP-300 - """ - """ RECOMENDED HASH USE: Algorithm Support MD2 MUST NOT @@ -1830,6 +1838,7 @@ class Features(Node): hostname = self.getTag('hostname', namespace=NS_DOMAIN_BASED_NAME) if hostname is not None: return hostname.getData() + return None def has_bind(self): return self.getTag('bind', namespace=NS_BIND) is not None ===================================== nbxmpp/simplexml.py ===================================== @@ -92,7 +92,8 @@ class Node: self.parent = parent self.nsp_cache = {} if nsp: - for k, v in nsp.items(): self.nsp_cache[k] = v + for k, v in nsp.items(): + self.nsp_cache[k] = v if attrs is not None: for attr, val in attrs.items(): @@ -337,6 +338,7 @@ class Node: return nodes[0] if not one: return nodes + return None def iterTags(self, name, attrs=None, namespace=None): """ @@ -408,8 +410,7 @@ class Node: node = self.getTags(name, attrs, namespace=namespace, one=1) if node: return node - else: - return self.addChild(name, attrs, namespace=namespace) + return self.addChild(name, attrs, namespace=namespace) def setTagAttr(self, tag, attr, val, namespace=None): """ @@ -438,6 +439,7 @@ class Node: if self.parent is not None: return self.parent.getXmlLang() + return None def has_attr(self, key): """ @@ -496,8 +498,8 @@ class T: def __setattr__(self, attr, val): if isinstance(val, Node): Node.__init__(self.node.setTag(attr), node=val) - else: - return self.node.setTagData(attr, val) + return None + return self.node.setTagData(attr, val) def __delattr__(self, attr): return self.node.delChild(attr) @@ -513,8 +515,8 @@ class NT(T): def __setattr__(self, attr, val): if isinstance(val, Node): self.node.addChild(attr, node=val) - else: - return self.node.addChild(attr, payload=[val]) + return None + return self.node.addChild(attr, payload=[val]) class NodeBuilder: @@ -655,7 +657,8 @@ class NodeBuilder: log.debug("Got higher than dispatch level. Stream terminated?") self._dec_depth() self.last_is_data = 0 - if self.__depth == 0: self.stream_footer_received() + if self.__depth == 0: + self.stream_footer_received() def handle_cdata(self, data): if self.last_is_data: ===================================== nbxmpp/stringprepare.py ===================================== @@ -81,8 +81,7 @@ class EmptyMappingTable: def map(self, c): if self._in_table_function(c): return None - else: - return c + return c class Profile: ===================================== nbxmpp/structs.py ===================================== @@ -216,6 +216,7 @@ class DiscoInfo(namedtuple('DiscoInfo', 'stanza identities features dataforms ti return NS_MAM_2 if NS_MAM_1 in self.features: return NS_MAM_1 + return None @property def has_mam_2(self): @@ -251,12 +252,14 @@ class DiscoInfo(namedtuple('DiscoInfo', 'stanza identities features dataforms ti if self.jid is not None: return self.jid.getNode() + return None @property def muc_identity_name(self): for identity in self.identities: if identity.category == 'conference': return identity.name + return None @property def muc_room_name(self): ===================================== nbxmpp/third_party/hsluv.py ===================================== @@ -120,15 +120,13 @@ def _dot_product(a, b): def _from_linear(c): if c <= 0.0031308: return 12.92 * c - else: - return 1.055 * math.pow(c, 0.416666666666666685) - 0.055 + return 1.055 * math.pow(c, 0.416666666666666685) - 0.055 def _to_linear(c): if c > 0.04045: return math.pow((c + 0.055) / 1.055, 2.4) - else: - return c / 12.92 + return c / 12.92 def xyz_to_rgb(_hx_tuple): @@ -150,15 +148,13 @@ def rgb_to_xyz(_hx_tuple): def _y_to_l(y): if y <= epsilon: return y / refY * kappa - else: - return 116 * math.pow(y / refY, 0.333333333333333315) - 16 + return 116 * math.pow(y / refY, 0.333333333333333315) - 16 def _l_to_y(l): if l <= 8: return refY * l / kappa - else: - return refY * math.pow((l + 16) / 116, 3) + return refY * math.pow((l + 16) / 116, 3) def xyz_to_luv(_hx_tuple): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/9cd576ebf095652ee8d8f60… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/9cd576ebf095652ee8d8f60… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Fix pylint errors
by Philipp Hörist 10 Mar '20

10 Mar '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 9cd576eb by lovetox at 2020-03-10T21:41:31+01:00 Fix pylint errors - trailing-newlines - chained-comparison - trailing-whitespace - unnecessary-pass - - - - - 5 changed files: - nbxmpp/idlequeue.py - nbxmpp/old_dispatcher.py - nbxmpp/protocol.py - nbxmpp/simplexml.py - nbxmpp/stringprepare.py Changes: ===================================== nbxmpp/idlequeue.py ===================================== @@ -86,25 +86,21 @@ class IdleObject: """ Called on stream failure """ - pass def pollin(self): """ Called on new read event """ - pass def pollout(self): """ Called on new write event (connect in sockets is a pollout) """ - pass def read_timeout(self): """ Called when timeout happened """ - pass class IdleCommand(IdleObject): ===================================== nbxmpp/old_dispatcher.py ===================================== @@ -458,7 +458,6 @@ class XMPPDispatcher(PlugIn): log.warning( 'Unregister failed: %s for "%s" type->%s ns->%s(%s)', handler, name, typ, ns, xmlns) - pass def RegisterDefaultHandler(self, handler): """ ===================================== nbxmpp/protocol.py ===================================== @@ -592,13 +592,11 @@ class NodeProcessed(Exception): Exception that should be raised by handler when the handling should be stopped """ - pass class StreamError(Exception): """ Base exception class for stream errors """ - pass class BadFormat(StreamError): pass @@ -2209,4 +2207,3 @@ class DataForm(Node): Simple dictionary interface for setting datafields values by their names """ return self.setField(name).setValue(val) - ===================================== nbxmpp/simplexml.py ===================================== @@ -93,7 +93,7 @@ class Node: self.nsp_cache = {} if nsp: for k, v in nsp.items(): self.nsp_cache[k] = v - + if attrs is not None: for attr, val in attrs.items(): if attr == 'xmlns': @@ -688,7 +688,6 @@ class NodeBuilder: up with the built node as argument. Can be redefined to convert incoming XML stanzas to program events """ - pass def stream_header_received(self): """ @@ -706,7 +705,7 @@ class NodeBuilder: """ Return True if at least one end tag was seen (at level) """ - return self.__depth <= level and self.__max_depth > level + return self.__depth <= level < self.__max_depth def _inc_depth(self): self.__last_depth = self.__depth ===================================== nbxmpp/stringprepare.py ===================================== @@ -35,7 +35,6 @@ class ILookupTable: """ Return whether character is in this table """ - pass class IMappingTable: @@ -47,7 +46,6 @@ class IMappingTable: """ Return mapping for character """ - pass class LookupTableFromFunction: View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/9cd576ebf095652ee8d8f605… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/9cd576ebf095652ee8d8f605… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 4 commits: Update .pylintrc
by Philipp Hörist 10 Mar '20

10 Mar '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 5e326b3e by lovetox at 2020-03-10T21:20:35+01:00 Update .pylintrc - - - - - a89e9a52 by lovetox at 2020-03-10T21:26:04+01:00 Remove unused imports - - - - - 6afd49a5 by lovetox at 2020-03-10T21:30:28+01:00 Fix pylint errors - - - - - 234379a6 by lovetox at 2020-03-10T21:31:25+01:00 Fix undefined var - - - - - 6 changed files: - .pylintrc - nbxmpp/connection.py - nbxmpp/old_dispatcher.py - nbxmpp/resolver.py - nbxmpp/util.py - nbxmpp/websocket.py Changes: ===================================== .pylintrc ===================================== @@ -50,7 +50,9 @@ confidence= # --enable=similarities". If you want to run only the classes checker, but have # no Warning level messages displayed, use"--disable=all --enable=classes # --disable=W" -disable=C0111,C0301,R1710,R0912,R0914,R0915,W0511,W0231,W0233 +# C0111 missing-docstring +# W0511 fix-me +disable=C0111,W0511 # Enable the message, report, category or checker with the given id(s). You can # either give multiple identifier separated by comma (,) or put this option @@ -94,7 +96,7 @@ max-nested-blocks=5 # List of additional names supposed to be defined in builtins. Remember that # you should avoid to define new builtins when possible. -additional-builtins=_ +additional-builtins= # Tells whether unused global variables should be treated as a violation. allow-global-unused-variables=yes @@ -138,7 +140,7 @@ ignore-mixin-members=yes # List of class names for which member attributes should not be checked (useful # for classes with dynamically set attributes). This supports the use of # qualified names. -ignored-classes=optparse.Values,thread._local,_thread._local +ignored-classes=optparse.Values,thread._local,_thread._local,gi.repository.GLib.Error # List of module names for which member attributes should not be checked # (useful for modules/projects where namespaces are manipulated during runtime @@ -220,10 +222,10 @@ indent-after-paren=4 indent-string=' ' # Maximum number of characters on a single line. -max-line-length=100 +max-line-length=80 # Maximum number of lines in a module -max-module-lines=1000 +max-module-lines=3000 # List of optional constructs for which whitespace checking is disabled. `dict- # separator` is used to allow tabulation in dicts, etc.: {1 : 1,\n222: 2}. @@ -357,7 +359,7 @@ known-third-party=enchant [DESIGN] # Maximum number of arguments for function / method -max-args=10 +max-args=15 # Maximum number of attributes for a class (see R0902). max-attributes=9999 @@ -366,22 +368,22 @@ max-attributes=9999 max-bool-expr=5 # Maximum number of branch for function / method body -max-branches=12 +max-branches=50 # Maximum number of locals for function / method body -max-locals=15 +max-locals=50 # Maximum number of parents for a class (see R0901). max-parents=7 # Maximum number of public methods for a class (see R0904). -max-public-methods=20 +max-public-methods=50 # Maximum number of return / yield for function / method body max-returns=100 # Maximum number of statements in function / method body -max-statements=50 +max-statements=100 # Minimum number of public methods for a class (see R0903). min-public-methods=0 ===================================== nbxmpp/connection.py ===================================== @@ -88,12 +88,12 @@ class Connection(Observable): if self._ignored_tls_errors: log.warning('Ignore TLS certificate errors: %s', - self._ignored_tls_errors) + self._ignored_tls_errors) self._peer_certificate_errors -= self._ignored_tls_errors if Gio.TlsCertificateFlags.UNKNOWN_CA in self._peer_certificate_errors: for accepted_certificate in self._accepted_certificates: - if certificate.is_same(accepted_certificate): + if self._peer_certificate.is_same(accepted_certificate): self._peer_certificate_errors.discard( Gio.TlsCertificateFlags.UNKNOWN_CA) break ===================================== nbxmpp/old_dispatcher.py ===================================== @@ -20,7 +20,6 @@ different handlers to different XMPP stanzas and namespaces """ import sys -import locale import re import uuid import logging ===================================== nbxmpp/resolver.py ===================================== @@ -127,6 +127,7 @@ class GioResolver(metaclass=Singleton): for result in result_list: if result.startswith('_xmpp-client-websocket'): return result.split('=')[1] + return None if __name__ == '__main__': ===================================== nbxmpp/util.py ===================================== @@ -21,7 +21,6 @@ import weakref import hashlib import uuid import binascii -import ipaddress import os import re from collections import defaultdict @@ -29,7 +28,6 @@ from collections import defaultdict from functools import wraps from functools import lru_cache -import precis_i18n.codec from gi.repository import Gio from nbxmpp.protocol import DiscoInfoMalformed @@ -37,7 +35,6 @@ from nbxmpp.protocol import isErrorNode from nbxmpp.protocol import NS_DATA from nbxmpp.protocol import NS_HTTPUPLOAD_0 from nbxmpp.const import GIO_TLS_ERRORS -from nbxmpp.const import StreamState from nbxmpp.protocol import NS_STREAMS from nbxmpp.protocol import NS_CLIENT from nbxmpp.protocol import NS_FRAMING ===================================== nbxmpp/websocket.py ===================================== @@ -128,7 +128,7 @@ class WebsocketConnection(Connection): def _on_websocket_closing(_websocket): log.info('Closing') - def _on_websocket_error(self, websocket, error): + def _on_websocket_error(self, _websocket, error): log.error(error) if self._state not in (TCPState.DISCONNECTED, TCPState.DISCONNECTING): self._finalize('disconnected') View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/6113c4f50de7509563e57ba… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/6113c4f50de7509563e57ba… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 3 commits: Remove trailing whitespace
by Philipp Hörist 10 Mar '20

10 Mar '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 45197eaf by lovetox at 2020-03-10T20:04:53+01:00 Remove trailing whitespace - - - - - 7b97addb by lovetox at 2020-03-10T20:12:31+01:00 Remove unused import - - - - - 6113c4f5 by lovetox at 2020-03-10T21:13:48+01:00 TCP: Consider failed TLS handshake as connection-failed - - - - - 2 changed files: - nbxmpp/client.py - nbxmpp/tcp.py Changes: ===================================== nbxmpp/client.py ===================================== @@ -307,7 +307,7 @@ class Client(Observable): def connect(self): if self._state != StreamState.DISCONNECTED: log.error('Stream can\'t reconnect, stream state: %s', self._state) - return + return if self._connect_successful: log.info('Reconnect') @@ -384,7 +384,6 @@ class Client(Observable): return self.send_stanza(stanza) def _on_connected(self, _connection, _signal_name): - self._connect_successful = True self.set_state(StreamState.CONNECTED) def _on_disconnected(self, _connection, _signal_name): @@ -545,6 +544,14 @@ class Client(Observable): 'Invalid stream header') return + if (self._stream_secure or + self.current_connection_type == ConnectionType.PLAIN): + # TLS Negotiation succeeded or we are connected PLAIN + # We received the stream header and consider this as + # successfully connected, this means we will not try + # other connection methods if an error happensafterwards + self._connect_successful = True + self.state = StreamState.WAIT_FOR_FEATURES elif self.state == StreamState.WAIT_FOR_FEATURES: ===================================== nbxmpp/tcp.py ===================================== @@ -16,7 +16,6 @@ # along with this program; If not, see <http://www.gnu.org/licenses/>. import logging -import struct from collections import deque from gi.repository import GLib @@ -56,6 +55,7 @@ class TCPConnection(Connection): self._connect_cancellable = Gio.Cancellable() self._read_cancellable = Gio.Cancellable() + self._tls_handshake_in_progress = False self._input_closed = False self._output_closed = False @@ -103,6 +103,7 @@ class TCPConnection(Connection): self._peer_certificate = connection.props.peer_certificate self._peer_certificate_errors = convert_tls_error_flags( connection.props.peer_certificate_errors) + self._tls_handshake_in_progress = False self.notify('certificate-set') def _on_connect_finished(self, client, result, _user_data): @@ -154,6 +155,7 @@ class TCPConnection(Connection): def start_tls_negotiation(self): log.info('Start TLS negotiation') + self._tls_handshake_in_progress = True remote_address = self._con.get_remote_address() identity = Gio.NetworkAddress.new(self._address.domain, remote_address.props.port) @@ -193,6 +195,12 @@ class TCPConnection(Connection): return quark = GLib.quark_try_string('g-tls-error-quark') + if error.matches(quark, Gio.TlsError.MISC): + if self._tls_handshake_in_progress: + log.error('Handshake failed: %s', error) + self._finalize('connection-failed') + return + if error.matches(quark, Gio.TlsError.EOF): log.info('Incoming stream closed: TLS EOF') self._finalize('disconnected') View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/b2f3eeddd79dec534e508c4… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/b2f3eeddd79dec534e508c4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Add dedicated connection state variable
by Philipp Hörist 03 Feb '20

03 Feb '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4f4624e0 by Philipp Hörist at 2020-02-03T21:13:12+01:00 Add dedicated connection state variable - - - - - 46a00a6a by Philipp Hörist at 2020-02-03T21:51:15+01:00 Remove invisible feature - This feature stems from the single device age - Depends on deprecated Privacy Lists (XEP-0016) - No support in other clients makes it in the current multiple device world useless - Hard to maintain, prevents us to use even basic features like MUC because it would leak presence - - - - - 30 changed files: - gajim/chat_control_base.py - gajim/command_system/implementation/standard.py - gajim/common/app.py - gajim/common/config.py - gajim/common/connection.py - gajim/common/const.py - gajim/common/contacts.py - gajim/common/dbus/logind.py - gajim/common/helpers.py - gajim/common/jingle_session.py - gajim/common/modules/bookmarks.py - gajim/common/modules/entity_time.py - gajim/common/modules/muc.py - gajim/common/modules/presence.py - gajim/common/modules/privacylists.py - gajim/common/modules/vcard_temp.py - gajim/common/zeroconf/connection_handlers_zeroconf.py - gajim/common/zeroconf/connection_zeroconf.py - gajim/data/gui/preferences_window.ui - gajim/data/gui/roster_window.ui - − gajim/data/icons/hicolor/16x16/status/dcraven-invisible.png - − gajim/data/icons/hicolor/16x16/status/gadu-invisible.png - − gajim/data/icons/hicolor/16x16/status/gnome-invisible.png - − gajim/data/icons/hicolor/16x16/status/goojim-invisible.png - − gajim/data/icons/hicolor/16x16/status/gota-invisible.png - − gajim/data/icons/hicolor/16x16/status/jabberbulb-invisible.png - − gajim/data/icons/hicolor/16x16/status/sun-invisible.png - − gajim/data/icons/hicolor/16x16/status/wroop-invisible.png - − gajim/data/icons/hicolor/32x32/status/dcraven-invisible.png - − gajim/data/icons/hicolor/32x32/status/gadu-invisible.png The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/adef78c5ee7fea63ea5973e63aeb45340… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/adef78c5ee7fea63ea5973e63aeb45340… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Check encryption before sending message
by Philipp Hörist 03 Feb '20

03 Feb '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 011ed972 by Philipp Hörist at 2020-02-02T22:04:43+01:00 Check encryption before sending message Check if encryption is activated for a JID before sending the message - - - - - adef78c5 by Philipp Hörist at 2020-02-02T23:21:44+01:00 Use contact instead of jid for OutgoingMessage - - - - - 12 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/common/connection.py - gajim/common/helpers.py - gajim/common/modules/chatstates.py - gajim/common/modules/httpupload.py - gajim/common/modules/message.py - gajim/common/structs.py - gajim/groupchat_control.py - gajim/gtk/single_message.py - gajim/privatechat_control.py - gajim/remote_control.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -923,8 +923,7 @@ class ChatControl(ChatControlBase): message, xhtml=None, process_commands=True, - attention=False, - is_muc_pm=False): + attention=False): """ Send a message to contact """ @@ -945,8 +944,7 @@ class ChatControl(ChatControlBase): type_='chat', xhtml=xhtml, process_commands=process_commands, - attention=attention, - is_muc_pm=is_muc_pm) + attention=attention) def get_our_nick(self): return app.nicks[self.account] ===================================== gajim/chat_control_base.py ===================================== @@ -981,8 +981,7 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): resource=None, xhtml=None, process_commands=True, - attention=False, - is_muc_pm=False): + attention=False): """ Send the given message to the active tab. Doesn't return None if error """ @@ -1004,10 +1003,9 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): self.contact) message_ = OutgoingMessage(account=self.account, - jid=self.contact.jid, + contact=self.contact, message=message, type_=type_, - is_muc_pm=is_muc_pm, chatstate=chatstate, resource=resource, user_nick=self.user_nick, @@ -1016,7 +1014,6 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): attention=attention, correct_id=correct_id, automatic_message=False, - encryption=self.encryption, xhtml=xhtml) con.send_message(message_) ===================================== gajim/common/connection.py ===================================== @@ -58,6 +58,7 @@ from gajim.common import modules from gajim.common import i18n from gajim.common.i18n import _ from gajim.common.nec import NetworkEvent +from gajim.common.helpers import get_encryption_method from gajim.common.connection_handlers import ConnectionHandlers from gajim.common.connection_handlers_events import OurShowEvent from gajim.common.connection_handlers_events import InformationEvent @@ -1332,13 +1333,15 @@ class Connection(CommonConnection, ConnectionHandlers): stanza = self.get_module('Message').build_message_stanza(message) message.stanza = stanza - if message.require_encryption: + + method = get_encryption_method(message.account, message.jid) + if method is not None: # TODO: Make extension point return encrypted message extension = 'encrypt' if message.is_groupchat: extension = 'gc_encrypt' - app.plugin_manager.extension_point(extension + message.encryption, + app.plugin_manager.extension_point(extension + method, self, message, self._send_message) @@ -1350,7 +1353,8 @@ class Connection(CommonConnection, ConnectionHandlers): message.set_sent_timestamp() message.message_id = self.connection.send(message.stanza) - app.nec.push_incoming_event(MessageSentEvent(None, **vars(message))) + app.nec.push_incoming_event( + MessageSentEvent(None, jid=message.jid, **vars(message))) if message.is_groupchat: return @@ -1362,13 +1366,9 @@ class Connection(CommonConnection, ConnectionHandlers): log.warning('Trying to send message while offline') return - if message.require_encryption: - raise ValueError('Encryption for multi recipient ' - 'messages not supported') - for jid in jids: message = message.copy() - message.jid = jid + message.contact = app.contacts.create_contact(jid, message.account) stanza = self.get_module('Message').build_message_stanza(message) message.stanza = stanza self._send_message(message) ===================================== gajim/common/helpers.py ===================================== @@ -27,6 +27,7 @@ from typing import Any # pylint: disable=unused-import from typing import Dict # pylint: disable=unused-import +from typing import Optional import sys import re @@ -1748,6 +1749,7 @@ def load_file_async(path, callback, user_data=None): _on_load_finished, (callback, user_data)) + def _on_load_finished(file, result, user_data): callback, user_data = user_data try: @@ -1756,3 +1758,9 @@ def _on_load_finished(file, result, user_data): callback(None, error, user_data) else: callback(contents, None, user_data) + + +def get_encryption_method(account: str, jid: str) -> Optional[str]: + config_key = '%s-%s' % (account, jid) + state = app.config.get_per('encryption', config_key, 'encryption') + return state or None ===================================== gajim/common/modules/chatstates.py ===================================== @@ -313,7 +313,7 @@ class Chatstate(BaseModule): def _send_chatstate(self, contact, chatstate): type_ = 'groupchat' if contact.is_groupchat else 'chat' message = OutgoingMessage(account=self._account, - jid=contact.jid, + contact=contact, message=None, type_=type_, chatstate=chatstate) ===================================== gajim/common/modules/httpupload.py ===================================== @@ -241,11 +241,10 @@ class HTTPUpload(BaseModule): type_ = 'groupchat' message = OutgoingMessage(account=self._account, - jid=transfer.contact.jid, + contact=transfer.contact, message=uri, type_=type_, - oob_url=uri, - encryption=transfer.encryption) + oob_url=uri) self._con.send_message(message) ===================================== gajim/common/modules/message.py ===================================== @@ -331,7 +331,7 @@ class Message(BaseModule): stanza.setReceiptRequest() # Mark Message as MUC PM - if message.is_muc_pm: + if message.contact.is_pm_contact: stanza.setTag('x', namespace=nbxmpp.NS_MUC_USER) # XEP-0085 ===================================== gajim/common/structs.py ===================================== @@ -55,11 +55,10 @@ class MUCData: class OutgoingMessage: def __init__(self, account, - jid, + contact, message, type_, subject=None, - is_muc_pm=False, chatstate=None, resource=None, user_nick=None, @@ -68,7 +67,6 @@ class OutgoingMessage: attention=None, correct_id=None, automatic_message=False, - encryption=None, oob_url=None, xhtml=None): @@ -79,7 +77,7 @@ class OutgoingMessage: raise ValueError('Trying to send message without content') self.account = account - self.jid = jid + self.contact = contact self.message = message self.type_ = type_ @@ -96,7 +94,6 @@ class OutgoingMessage: self.additional_data = AdditionalDataDict() self.subject = subject - self.is_muc_pm = is_muc_pm self.chatstate = chatstate self.resource = resource self.user_nick = user_nick @@ -105,7 +102,6 @@ class OutgoingMessage: self.attention = attention self.correct_id = correct_id self.automatic_message = automatic_message - self.encryption = encryption self.oob_url = oob_url @@ -127,7 +123,7 @@ class OutgoingMessage: def copy(self): message = OutgoingMessage(self.account, - self.jid, + self.contact, self.message, self.type_) for name, value in vars(self).items(): @@ -135,6 +131,10 @@ class OutgoingMessage: message.additional_data = self.additional_data.copy() return message + @property + def jid(self): + return self.contact.jid + @property def is_groupchat(self): return self.type_ == 'groupchat' @@ -156,10 +156,6 @@ class OutgoingMessage: def is_encrypted(self): return bool(self.additional_data.get_value('encrypted', 'name', False)) - @property - def require_encryption(self): - return bool(self.encryption) - @property def msg_iq(self): # Backwards compatibility for plugins ===================================== gajim/groupchat_control.py ===================================== @@ -1586,13 +1586,12 @@ class GroupchatControl(ChatControlBase): # Send the message message_ = OutgoingMessage(account=self.account, - jid=self.room_jid, + contact=self.contact, message=message, type_='groupchat', label=label, chatstate=chatstate, - correct_id=correct_id, - encryption=self.encryption) + correct_id=correct_id) message_.additional_data.set_value('gajim', 'xhtml', xhtml) con.send_message(message_) ===================================== gajim/gtk/single_message.py ===================================== @@ -251,7 +251,7 @@ class SingleMessageWindow(Gtk.ApplicationWindow): recipient_list.append(to_whom_jid) message = OutgoingMessage(account=self.account, - jid=None, + contact=None, message=message, type_='normal', subject=subject) ===================================== gajim/privatechat_control.py ===================================== @@ -206,8 +206,7 @@ class PrivateChatControl(ChatControl): ChatControl.send_message(self, message, xhtml=xhtml, process_commands=process_commands, - attention=attention, - is_muc_pm=True) + attention=attention) def update_ui(self): if self.gc_contact.presence.is_unavailable: ===================================== gajim/remote_control.py ===================================== @@ -509,25 +509,24 @@ class GajimRemote(Server): if not jid or not message: return False - connected_account = self._get_account_and_contact(account, jid)[0] - if connected_account: - connection = app.connections[connected_account] - sessions = connection.get_sessions(jid) - if not sessions: - connection.make_new_session(jid) - ctrl = app.interface.msg_win_mgr.search_control( - jid, connected_account) - if ctrl: - ctrl.send_message(message) - else: - message_ = OutgoingMessage(account=connected_account, - jid=jid, - message=message, - type_=type_, - control=ctrl) - connection.send_message(message_) - return True - return False + connected_account, contact = self._get_account_and_contact(account, jid) + if not connected_account or contact is None: + return False + + connection = app.connections[connected_account] + ctrl = app.interface.msg_win_mgr.search_control( + jid, connected_account) + if ctrl: + ctrl.send_message(message) + else: + message_ = OutgoingMessage(account=connected_account, + contact=contact, + message=message, + type_=type_, + subject=subject, + control=ctrl) + connection.send_message(message_) + return True def send_chat_message(self, jid, message, account): """ @@ -545,20 +544,28 @@ class GajimRemote(Server): def send_groupchat_message(self, room_jid, message, account): """ - Send 'message' to groupchat 'room_jid', using account (optional) 'account' + Send 'message' to groupchat 'room_jid', + using account (optional) 'account' """ if not room_jid or not message: return False connected_account = self._get_account_for_groupchat(account, room_jid) - if connected_account: - message_ = OutgoingMessage(account=connected_account, - jid=room_jid, - message=message, - type_='groupchat') - con = app.connections[connected_account] - con.send_message(message_) - return True - return False + if not connected_account: + return False + + contact = app.contacts.get_groupchat_contact(connected_account, + room_jid) + if contact is None: + return False + + message_ = OutgoingMessage(account=connected_account, + contact=contact, + message=message, + type_='groupchat') + con = app.connections[connected_account] + con.send_message(message_) + return True + def open_chat(self, jid, account, message): """ View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/3512e2f9c0ac9fe312695635fa64352f0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/3512e2f9c0ac9fe312695635fa64352f0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Set encryption attribute on HTTPUpload and Groupchat messages
by Philipp Hörist 02 Feb '20

02 Feb '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3512e2f9 by Philipp Hörist at 2020-02-02T16:58:29+01:00 Set encryption attribute on HTTPUpload and Groupchat messages This fixes an regression from the send message refactor - - - - - 2 changed files: - gajim/common/modules/httpupload.py - gajim/groupchat_control.py Changes: ===================================== gajim/common/modules/httpupload.py ===================================== @@ -244,7 +244,8 @@ class HTTPUpload(BaseModule): jid=transfer.contact.jid, message=uri, type_=type_, - oob_url=uri) + oob_url=uri, + encryption=transfer.encryption) self._con.send_message(message) ===================================== gajim/groupchat_control.py ===================================== @@ -1591,7 +1591,8 @@ class GroupchatControl(ChatControlBase): type_='groupchat', label=label, chatstate=chatstate, - correct_id=correct_id) + correct_id=correct_id, + encryption=self.encryption) message_.additional_data.set_value('gajim', 'xhtml', xhtml) con.send_message(message_) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3512e2f9c0ac9fe312695635fa64352f02… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3512e2f9c0ac9fe312695635fa64352f02… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Smacks: Fix parsing error text on failed resume
by Philipp Hörist 02 Feb '20

02 Feb '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 37f5d46a by Philipp Hörist at 2020-02-02T09:02:16+01:00 Smacks: Fix parsing error text on failed resume - - - - - 1 changed file: - nbxmpp/smacks.py Changes: ===================================== nbxmpp/smacks.py ===================================== @@ -270,7 +270,7 @@ class Smacks(PlugIn): stanza.getAttr('h')) self._validate_ack(stanza, self._old_uqueue) else: - for tag in stanza.getTags(): + for tag in stanza.getChildren(): if tag.getName() != 'text': log.info(tag.getName()) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/37f5d46ac7529222f15be29781… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/37f5d46ac7529222f15be29781… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: CI: allow redefinition of variables in mypy tests
by Philipp Hörist 01 Feb '20

01 Feb '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4f213669 by Philipp Hörist at 2020-02-01T13:25:09+01:00 CI: allow redefinition of variables in mypy tests - - - - - 975f1b3b by Philipp Hörist at 2020-02-01T14:08:34+01:00 Bookmarks: Store bookmarks in dictonary This allows for much faster access than with a list - - - - - 3 changed files: - gajim/common/modules/bookmarks.py - gajim/gui_interface.py - mypy.ini Changes: ===================================== gajim/common/modules/bookmarks.py ===================================== @@ -17,9 +17,13 @@ from typing import Any from typing import List from typing import Dict +from typing import Set +from typing import Tuple +from typing import Union from typing import Optional import nbxmpp +from nbxmpp.protocol import JID from nbxmpp.util import is_error_result from nbxmpp.structs import BookmarkData from nbxmpp.const import BookmarkStoreType @@ -46,32 +50,28 @@ class Bookmarks(BaseModule): self._register_pubsub_handler(self._bookmark_2_event_received) self._conversion = False self._conversion_2 = False - self._bookmarks = [] + self._bookmarks = {} self._join_timeouts = [] self._request_in_progress = True @property - def conversion(self): + def conversion(self) -> bool: return self._conversion @property - def conversion_2(self): + def conversion_2(self) -> bool: return self._conversion_2 @property - def bookmarks(self): - return self._bookmarks - - @bookmarks.setter - def bookmarks(self, value): - self._bookmarks = value + def bookmarks(self) -> List[BookmarkData]: + return self._bookmarks.values() @property - def using_bookmark_1(self): + def using_bookmark_1(self) -> bool: return self._pubsub_support() and self.conversion @property - def using_bookmark_2(self): + def using_bookmark_2(self) -> bool: return self._pubsub_support() and self.conversion_2 @event_node(nbxmpp.NS_BOOKMARKS) @@ -91,11 +91,9 @@ class Bookmarks(BaseModule): self._log.info('Ignore update, pubsub request in progress') return - bookmarks = properties.pubsub_event.data - if bookmarks is None: - bookmarks = [] + bookmarks = self._convert_to_dict(properties.pubsub_event.data) - old_bookmarks = self._convert_to_set(self._bookmarks) + old_bookmarks = self._bookmarks.copy() self._bookmarks = bookmarks self._act_on_changed_bookmarks(old_bookmarks) app.nec.push_incoming_event( @@ -115,28 +113,22 @@ class Bookmarks(BaseModule): self._log.info('Ignore update, pubsub request in progress') return - old_bookmarks = self._convert_to_set(self._bookmarks) + old_bookmarks = self._bookmarks.copy() if properties.pubsub_event.deleted or properties.pubsub_event.purged: self._log.info('Bookmark node deleted/purged') - self._bookmarks = [] + self._bookmarks = {} elif properties.pubsub_event.retracted: jid = properties.pubsub_event.id self._log.info('Retract: %s', jid) - bookmark = self.get_bookmark_from_jid(jid) + bookmark = self._bookmarks.get(jid) if bookmark is not None: - try: - self._bookmarks.remove(bookmark) - except KeyError: - pass + self._bookmarks.pop(bookmark, None) else: new_bookmark = properties.pubsub_event.data - old_bookmark = self.get_bookmark_from_jid(new_bookmark.jid) - if old_bookmark is not None: - self._bookmarks.remove(old_bookmark) - self._bookmarks.append(new_bookmark) + self._bookmarks[new_bookmark.jid] = properties.pubsub_event.data self._act_on_changed_bookmarks(old_bookmarks) app.nec.push_incoming_event( @@ -156,8 +148,11 @@ class Bookmarks(BaseModule): self._conversion = True self._log.info('Discovered Bookmarks Conversion: %s', info.jid) - def _act_on_changed_bookmarks(self, old_bookmarks): + def _act_on_changed_bookmarks( + self, old_bookmarks: Dict[str, BookmarkData]) -> None: + new_bookmarks = self._convert_to_set(self._bookmarks) + old_bookmarks = self._convert_to_set(old_bookmarks) changed = new_bookmarks - old_bookmarks if not changed: return @@ -166,7 +161,7 @@ class Bookmarks(BaseModule): bookmarks = [] for jid in join: self._log.info('Schedule autojoin in 10s for: %s', jid) - bookmarks.append(self.get_bookmark_from_jid(jid)) + bookmarks.append(self._bookmarks.get(jid)) # If another client creates a MUC, the MUC is locked until the # configuration is finished. Give the user some time to finish # the configuration. @@ -178,23 +173,32 @@ class Bookmarks(BaseModule): # leave = [jid for jid, autojoin in changed if not autojoin] @staticmethod - def _convert_to_set(bookmarks): + def _convert_to_set( + bookmarks: Dict[str, BookmarkData]) -> Set[Tuple[str, bool]]: + set_ = set() - for bookmark in bookmarks: - set_.add((bookmark.jid, bookmark.autojoin)) + for jid, bookmark in bookmarks.items(): + set_.add((jid, bookmark.autojoin)) return set_ - def get_bookmark_from_jid(self, jid): - for bookmark in self._bookmarks: - if bookmark.jid == jid: - return bookmark - return None + @staticmethod + def _convert_to_dict(bookmarks: List) -> Dict[str, BookmarkData]: + _dict = {} # type: Dict[str, BookmarkData] + if bookmarks is None: + return _dict + + for bookmark in bookmarks: + _dict[bookmark.jid] = bookmark + return _dict + + def get_bookmark(self, jid: Union[str, JID]) -> BookmarkData: + return self._bookmarks.get(jid) def _pubsub_support(self) -> bool: return (self._con.get_module('PEP').supported and self._con.get_module('PubSub').publish_options) - def request_bookmarks(self): + def request_bookmarks(self) -> None: if not app.account_is_connected(self._account): return @@ -209,34 +213,34 @@ class Bookmarks(BaseModule): self._nbxmpp('Bookmarks').request_bookmarks( type_, callback=self._bookmarks_received) - def _bookmarks_received(self, bookmarks): + def _bookmarks_received(self, bookmarks: Any) -> None: if is_error_result(bookmarks): self._log.info(bookmarks) - bookmarks = [] + bookmarks = None self._request_in_progress = False - self._bookmarks = bookmarks + self._bookmarks = self._convert_to_dict(bookmarks) self.auto_join_bookmarks() app.nec.push_incoming_event( NetworkEvent('bookmarks-received', account=self._account)) - def store_difference(self, bookmarks): + def store_difference(self, bookmarks: List) -> None: if self.using_bookmark_2: retract, add_or_modify = self._determine_changed_bookmarks( bookmarks, self._bookmarks) for bookmark in retract: - self.remove(str(bookmark.jid)) + self.remove(bookmark.jid) if add_or_modify: self.store_bookmarks(add_or_modify) - self._bookmarks = bookmarks + self._bookmarks = self._convert_to_dict(bookmarks) else: - self._bookmarks = bookmarks + self._bookmarks = self._convert_to_dict(bookmarks) self.store_bookmarks() - def store_bookmarks(self, bookmarks=None): + def store_bookmarks(self, bookmarks: list = None) -> None: if not app.account_is_connected(self._account): return @@ -247,13 +251,15 @@ class Bookmarks(BaseModule): if self.conversion_2: type_ = BookmarkStoreType.PUBSUB_BOOKMARK_2 - self._nbxmpp('Bookmarks').store_bookmarks(bookmarks or self._bookmarks, - type_) + if bookmarks is None: + bookmarks = self._bookmarks.values() + + self._nbxmpp('Bookmarks').store_bookmarks(bookmarks, type_) app.nec.push_incoming_event( NetworkEvent('bookmarks-received', account=self._account)) - def store_bookmark(self, bookmark): + def store_bookmark(self, bookmark: BookmarkData) -> None: if not app.account_is_connected(self._account): return @@ -276,7 +282,7 @@ class Bookmarks(BaseModule): return if bookmarks is None: - bookmarks = self._bookmarks + bookmarks = self._bookmarks.values() for bookmark in bookmarks: if bookmark.autojoin: @@ -292,7 +298,7 @@ class Bookmarks(BaseModule): minimized=minimize) def modify(self, jid: str, **kwargs: Dict[str, str]) -> None: - bookmark = self.get_bookmark_from_jid(jid) + bookmark = self._bookmarks.get(jid) if bookmark is None: return @@ -301,8 +307,7 @@ class Bookmarks(BaseModule): # No change happened return self._log.info('Modify bookmark: %s %s', jid, kwargs) - self._bookmarks.remove(bookmark) - self._bookmarks.append(new_bookmark) + self._bookmarks[jid] = new_bookmark if self.using_bookmark_2: self.store_bookmark(new_bookmark) @@ -310,13 +315,13 @@ class Bookmarks(BaseModule): self.store_bookmarks() def add_or_modify(self, jid: str, **kwargs: Dict[str, str]) -> None: - bookmark = self.get_bookmark_from_jid(jid) + bookmark = self._bookmarks.get(jid) if bookmark is not None: self.modify(jid, **kwargs) return new_bookmark = BookmarkData(jid=jid, **kwargs) - self._bookmarks.append(new_bookmark) + self._bookmarks[jid] = new_bookmark self._log.info('Add new bookmark: %s', new_bookmark) if self.using_bookmark_2: @@ -324,22 +329,25 @@ class Bookmarks(BaseModule): else: self.store_bookmarks() - def remove(self, jid: str, publish: bool = True) -> None: - bookmark = self.get_bookmark_from_jid(jid) - if bookmark is None: + def remove(self, jid: JID, publish: bool = True) -> None: + removed = self._bookmarks.pop(jid, False) + if not removed: return - self._bookmarks.remove(bookmark) if publish: if self.using_bookmark_2: - self._nbxmpp('Bookmarks').retract_bookmark(jid) + self._nbxmpp('Bookmarks').retract_bookmark(str(jid)) else: self.store_bookmarks() @staticmethod - def _determine_changed_bookmarks(new_bookmarks, old_bookmarks): + def _determine_changed_bookmarks( + new_bookmarks: List[BookmarkData], + old_bookmarks: Dict[str, BookmarkData]) -> Tuple[ + List[BookmarkData], List[BookmarkData]]: + new_jids = [bookmark.jid for bookmark in new_bookmarks] new_bookmarks = set(new_bookmarks) - old_bookmarks = set(old_bookmarks) + old_bookmarks = set(old_bookmarks.values()) retract = [] add_or_modify = [] @@ -353,13 +361,13 @@ class Bookmarks(BaseModule): return retract, add_or_modify def get_name_from_bookmark(self, jid: str) -> str: - bookmark = self.get_bookmark_from_jid(jid) + bookmark = self._bookmarks.get(jid) if bookmark is None: return '' return bookmark.name def is_bookmark(self, jid: str) -> bool: - return self.get_bookmark_from_jid(jid) is not None + return jid in self._bookmarks def purge_pubsub_bookmarks(self) -> None: self._log.info('Purge/Delete Bookmarks on PubSub, ' ===================================== gajim/gui_interface.py ===================================== @@ -1462,7 +1462,7 @@ class Interface: # Fetch data from bookmarks con = app.connections[account] - bookmark = con.get_module('Bookmarks').get_bookmark_from_jid(room_jid) + bookmark = con.get_module('Bookmarks').get_bookmark(room_jid) if bookmark is not None: if bookmark.nick is not None: nick = bookmark.nick ===================================== mypy.ini ===================================== @@ -2,6 +2,7 @@ python_version = 3.5 warn_unused_configs = True disallow_incomplete_defs = True +allow_redefinition = True [mypy-nbxmpp.*] ignore_missing_imports = True View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/0d0a31a4f13beedfae78eb27c1aaad7b9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/0d0a31a4f13beedfae78eb27c1aaad7b9… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits