jshiffer/slixmpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix xep_0050 changes after form refactor.

Browse Source
This commit is contained in:
Robert Robinson 2015-09-14 17:00:53 -06:00
parent 0724f623bb
commit 93c705fb31
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sleekxmpp/plugins/xep_0004/stanza/form.py
View File

@ -22,8 +22,7 @@ class Form(ElementBase):
namespace = 'jabber:x:data' namespace = 'jabber:x:data'
name = 'x' name = 'x'
plugin_attrib = 'form' plugin_attrib = 'form'
interfaces = set(('instructions', 'items', interfaces = set(('instructions', 'items', 'reported', 'title', 'type', ))
'reported', 'title', 'type', ))
sub_interfaces = set(('title',)) sub_interfaces = set(('title',))
form_types = set(('cancel', 'form', 'result', 'submit')) form_types = set(('cancel', 'form', 'result', 'submit'))
@ -43,7 +42,7 @@ class Form(ElementBase):
@property @property
def field(self): def field(self):
return self['fields'] return self.get_fields()
def set_type(self, ftype): def set_type(self, ftype):
self._set_attr('type', ftype) self._set_attr('type', ftype)
@ -178,7 +177,7 @@ class Form(ElementBase):
def get_values(self): def get_values(self):
values = OrderedDict() values = OrderedDict()
fields = self['fields'] fields = self.get_fields()
for var in fields: for var in fields:
values[var] = fields[var]['value'] values[var] = fields[var]['value']
return values return values
@ -226,7 +225,7 @@ class Form(ElementBase):
self.add_reported(var, **field) self.add_reported(var, **field)
def set_values(self, values): def set_values(self, values):
fields = self['fields'] fields = self.get_fields()
for field in values: for field in values:
if field not in self.get_fields(): if field not in self.get_fields():
fields[field] = self.add_field(var=field) fields[field] = self.add_field(var=field)

8
tests/test_stream_xep_0050.py
View File

@ -119,7 +119,7 @@ class TestAdHocCommands(SleekTest):
def handle_command(iq, session): def handle_command(iq, session):
def handle_form(form, session): def handle_form(form, session):
results.append(form['values']['foo']) results.append(form.get_values()['foo'])
form = self.xmpp['xep_0004'].makeForm('form') form = self.xmpp['xep_0004'].makeForm('form')
form.addField(var='foo', ftype='text-single', label='Foo') form.addField(var='foo', ftype='text-single', label='Foo')
@ -191,10 +191,10 @@ class TestAdHocCommands(SleekTest):
def handle_command(iq, session): def handle_command(iq, session):
def handle_step2(form, session): def handle_step2(form, session):
results.append(form['values']['bar']) results.append(form.get_values()['bar'])
def handle_step1(form, session): def handle_step1(form, session):
results.append(form['values']['foo']) results.append(form.get_values()['foo'])
form = self.xmpp['xep_0004'].makeForm('form') form = self.xmpp['xep_0004'].makeForm('form')
form.addField(var='bar', ftype='text-single', label='Bar') form.addField(var='bar', ftype='text-single', label='Bar')
@ -426,7 +426,7 @@ class TestAdHocCommands(SleekTest):
def handle_form(forms, session): def handle_form(forms, session):
for form in forms: for form in forms:
results.append(form['values']['FORM_TYPE']) results.append(form.get_values()['FORM_TYPE'])
form1 = self.xmpp['xep_0004'].makeForm('form') form1 = self.xmpp['xep_0004'].makeForm('form')
form1.addField(var='FORM_TYPE', ftype='hidden', value='form_1') form1.addField(var='FORM_TYPE', ftype='hidden', value='form_1')