erebion/libervia-backend
Watch
1
0
Fork
You've already forked libervia-backend
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

plugin import: fixed deserialisation of pubsub service

Browse source
This commit is contained in:
Goffi 2017-11-15 21:15:42 +01:00
commit a6e55a6c56
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/plugins/plugin_import.py
View file

@ -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):