Commit f5e499ce authored by Philipp Hörist's avatar Philipp Hörist

Simplify MucConfigResult

parent 4feb9d4a
......@@ -364,9 +364,7 @@ class MUC:
@callback
def _config_received(self, stanza):
if not isResultNode(stanza):
log.info('Error: %s', stanza.getError())
return MucConfigResult(jid=stanza.getFrom(),
error=stanza.getError())
return raise_error(log.info, stanza)
jid = stanza.getFrom()
payload = stanza.getQueryPayload()
......
......@@ -51,6 +51,9 @@ MucUserData.__new__.__defaults__ = (None, None, None, None, None)
MucDestroyed = namedtuple('MucDestroyed', 'alternate reason password')
MucDestroyed.__new__.__defaults__ = (None, None, None)
MucConfigResult = namedtuple('MucConfigResult', 'jid form')
MucConfigResult.__new__.__defaults__ = (None,)
AffiliationResult = namedtuple('AffiliationResult', 'jid users')
EntityCapsData = namedtuple('EntityCapsData', 'hash node ver')
......@@ -378,12 +381,6 @@ class CommonResult(BaseResult, namedtuple('CommonResult', 'jid error')):
CommonResult.__new__.__defaults__ = (None,)
class MucConfigResult(BaseResult, namedtuple('MucConfigResult',
'jid form error')):
pass
MucConfigResult.__new__.__defaults__ = (None, None)
class BlockingListResult(BaseResult, namedtuple('BlockingListResult',
'blocking_list error')):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment