diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-08-30 23:11:11 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-08-30 23:11:11 -0700 |
| commit | 628978fc8c08a45804983b1888f7dbea583d6a28 (patch) | |
| tree | 6d1de90bbd09ee546ca76a16bce6b3e439131001 | |
| parent | e0a1c477d03ab353107cd8cf5bb420edc2262a97 (diff) | |
| parent | 7fb9d6871407380496e3beb193d4b7c269fcf035 (diff) | |
| download | slixmpp-628978fc8c08a45804983b1888f7dbea583d6a28.tar.gz slixmpp-628978fc8c08a45804983b1888f7dbea583d6a28.tar.bz2 slixmpp-628978fc8c08a45804983b1888f7dbea583d6a28.tar.xz slixmpp-628978fc8c08a45804983b1888f7dbea583d6a28.zip | |
Merge branch 'develop' of github.com:fritzy/SleekXMPP into develop
| -rw-r--r-- | sleekxmpp/plugins/xep_0060/stanza/pubsub.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sleekxmpp/plugins/xep_0060/stanza/pubsub.py b/sleekxmpp/plugins/xep_0060/stanza/pubsub.py index d2da8ec9..ed3e57d4 100644 --- a/sleekxmpp/plugins/xep_0060/stanza/pubsub.py +++ b/sleekxmpp/plugins/xep_0060/stanza/pubsub.py @@ -221,9 +221,7 @@ class Options(ElementBase): def getOptions(self): config = self.xml.find('{jabber:x:data}x') - form = xep_0004.Form() - if config is not None: - form.fromXML(config) + form = xep_0004.Form(xml=config) return form def setOptions(self, value): @@ -254,9 +252,7 @@ class PublishOptions(ElementBase): def get_publish_options(self): config = self.xml.find('{jabber:x:data}x') - form = xep_0004.Form() - if config is not None: - form.fromXML(config) + form = xep_0004.Form(xml=config) return form def set_publish_options(self, value): |