Philipp Hörist pushed to branch master at gajim / python-nbxmpp

Commits: b7cb8019 by Philipp Hörist at 2019-02-19T16:52:43Z Annotations: Fix log message

- - - - - e83b5d4d by Philipp Hörist at 2019-02-19T18:01:17Z EME: Use namedtuple

- - - - -

3 changed files:

- nbxmpp/modules/annotations.py - nbxmpp/modules/eme.py - nbxmpp/structs.py

Changes:

===================================== nbxmpp/modules/annotations.py ===================================== @@ -86,7 +86,7 @@ class Annotations:

log.info('Received annotations from %s:', self.domain) for note in notes: - log.info(notes) + log.info(note) return notes

@call_on_response('_default_response')

===================================== nbxmpp/modules/eme.py ===================================== @@ -19,6 +19,7 @@ import logging

from nbxmpp.protocol import NS_EME from nbxmpp.structs import StanzaHandler +from nbxmpp.structs import EMEData

log = logging.getLogger('nbxmpp.m.eme')

@@ -35,16 +36,15 @@ class EME:

@staticmethod def _process_eme(_con, stanza, properties): - enc_tag = stanza.getTag('encryption', namespace=NS_EME) - if enc_tag is None: + encryption = stanza.getTag('encryption', namespace=NS_EME) + if encryption is None: return

- ns = enc_tag.getAttr('namespace') - if ns is None: + name = encryption.getAttr('name') + namespace = encryption.getAttr('namespace') + if namespace is None: log.warning('No namespace on message') return

- properties.eme = {} - properties.eme['namespace'] = ns - properties.eme['name'] = enc_tag.getAttr('name') + properties.eme = EMEData(name=name, namespace=namespace) log.info('Found data: %s', properties.eme)

===================================== nbxmpp/structs.py ===================================== @@ -98,6 +98,8 @@ OMEMOMessage = namedtuple('OMEMOMessage', 'sid iv keys payload') AnnotationNote = namedtuple('AnnotationNote', 'jid data cdate mdate') AnnotationNote.__new__.__defaults__ = (None, None)

+EMEData = namedtuple('EMEData', 'name namespace') +

class OMEMOBundle(namedtuple('OMEMOBundle', 'spk spk_signature ik otpks')): def pick_prekey(self):

View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/30876f0e6b45d480cfc95dcb46...