# HG changeset patch # User Goffi # Date 1510776942 -3600 # Node ID b52e78cc86edcdc70a9cd6bfecbf70451bbf15a9 # Parent 49884c579266d82d18023430dead2874a375b04a plugin import: fixed deserialisation of pubsub service diff -r 49884c579266 -r b52e78cc86ed src/plugins/plugin_import.py --- a/src/plugins/plugin_import.py Wed Nov 15 08:58:56 2017 +0100 +++ b/src/plugins/plugin_import.py Wed Nov 15 21:15:42 2017 +0100 @@ -23,6 +23,7 @@ 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 @@ 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):