From a6e55a6c56750a8a127a5bcf6390689b8ffb6360 Mon Sep 17 00:00:00 2001 From: Goffi Date: Wed, 15 Nov 2017 21:15:42 +0100 Subject: [PATCH] plugin import: fixed deserialisation of pubsub service --- src/plugins/plugin_import.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/plugins/plugin_import.py b/src/plugins/plugin_import.py index caa90c56..3213b0c9 100755 --- a/src/plugins/plugin_import.py +++ b/src/plugins/plugin_import.py @@ -23,6 +23,7 @@ from sat.core.log import getLogger log = getLogger(__name__) from twisted.internet import defer from sat.core import exceptions +from twisted.words.protocols.jabber import jid from functools import partial import collections import uuid @@ -116,7 +117,8 @@ class ImportPlugin(object): options[option] = json.loads(options[option]) except ValueError: raise exceptions.DataError(_(u'invalid json option: {name}').format(name=option)) - return self.doImport(client, import_handler, unicode(name), unicode(location), options, pubsub_service or None, pubsub_node or None) + pubsub_service = jid.JID(pubsub_service) if pubsub_service else None + return self.doImport(client, import_handler, unicode(name), unicode(location), options, pubsub_service, pubsub_node or None) @defer.inlineCallbacks def doImport(self, client, import_handler, name, location, options=None, pubsub_service=None, pubsub_node=None):