diff --git a/frontends/src/jp/base.py b/frontends/src/jp/base.py index 3a57ab02..5294c3ab 100644 --- a/frontends/src/jp/base.py +++ b/frontends/src/jp/base.py @@ -504,14 +504,22 @@ class Jp(object): self.args.node = uri_data[u'node'] uri_item = uri_data.get(u'item') if uri_item: + # there is an item in URI + # we use it only if item is not already set + # and item_last is not used either try: - item, item_magic = self.args.item, self.args.item_magic + item = self.args.item except AttributeError: if not self.args.items: self.args.items = [uri_item] else: - if not item and not item_magic: - self.args.item = uri_item + if not item: + try: + item_last = self.args.item_last + except AttributeError: + item_last = False + if not item_last: + self.args.item = uri_item else: self.parser.error(_(u'XMPP URL is not a pubsub one: {url}').format(url=url)) flags = self.args._cmd._pubsub_flags