hueso/gajim-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[openpgp] Use nbxmpp.namespaces

Browse Source
This commit is contained in:
lovetox
2020-04-19 22:12:31 +02:00
parent fcaa83e3d2
commit 4a95f1d5bc
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
openpgp/modules/util.py
View File

@@ -17,17 +17,17 @@
from enum import IntEnum
from collections import namedtuple
import nbxmpp
from nbxmpp.namespaces import Namespace
ENCRYPTION_NAME = 'OpenPGP'
NOT_ENCRYPTED_TAGS = [
('no-store', nbxmpp.NS_MSG_HINTS),
('store', nbxmpp.NS_MSG_HINTS),
('no-copy', nbxmpp.NS_MSG_HINTS),
('no-permanent-store', nbxmpp.NS_MSG_HINTS),
('origin-id', nbxmpp.NS_SID),
('no-store', Namespace.HINTS),
('store', Namespace.HINTS),
('no-copy', Namespace.HINTS),
('no-permanent-store', Namespace.HINTS),
('origin-id', Namespace.SID),
('thread', None)
]
@@ -42,7 +42,7 @@ class Trust(IntEnum):
def prepare_stanza(stanza, payload):
delete_nodes(stanza, 'openpgp', nbxmpp.NS_OPENPGP)
delete_nodes(stanza, 'openpgp', Namespace.OPENPGP)
delete_nodes(stanza, 'body')
nodes = [(node.getName(), node.getNamespace()) for node in payload]
@@ -56,7 +56,7 @@ def prepare_stanza(stanza, payload):
def delete_nodes(stanza, name, namespace=None):
attrs = None
if namespace is not None:
attrs = {'xmlns': nbxmpp.NS_OPENPGP}
attrs = {'xmlns': Namespace.OPENPGP}
nodes = stanza.getTags(name, attrs)
for node in nodes:
stanza.delChild(node)