diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-06-19 01:29:48 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-06-19 01:29:48 -0700 |
| commit | d92aa05b5c18806ab5addc947eeedaaf4d51500e (patch) | |
| tree | bdb64fa72894b6689b38fa6e96a29e15548422fd /sleekxmpp/stanza | |
| parent | f7a74d960edb3ced00423c081ec74e9e91f3aea2 (diff) | |
| download | slixmpp-d92aa05b5c18806ab5addc947eeedaaf4d51500e.tar.gz slixmpp-d92aa05b5c18806ab5addc947eeedaaf4d51500e.tar.bz2 slixmpp-d92aa05b5c18806ab5addc947eeedaaf4d51500e.tar.xz slixmpp-d92aa05b5c18806ab5addc947eeedaaf4d51500e.zip | |
PEP8 formatting updates.
Diffstat (limited to 'sleekxmpp/stanza')
| -rw-r--r-- | sleekxmpp/stanza/error.py | 2 | ||||
| -rw-r--r-- | sleekxmpp/stanza/rootstanza.py | 3 | ||||
| -rw-r--r-- | sleekxmpp/stanza/roster.py | 4 | ||||
| -rw-r--r-- | sleekxmpp/stanza/stream_error.py | 1 |
4 files changed, 5 insertions, 5 deletions
diff --git a/sleekxmpp/stanza/error.py b/sleekxmpp/stanza/error.py index 35a8913a..809a74b4 100644 --- a/sleekxmpp/stanza/error.py +++ b/sleekxmpp/stanza/error.py @@ -51,7 +51,7 @@ class Error(ElementBase): namespace = 'jabber:client' name = 'error' plugin_attrib = 'error' - interfaces = set(('code', 'condition', 'text', 'type', + interfaces = set(('code', 'condition', 'text', 'type', 'gone', 'redirect')) sub_interfaces = set(('text',)) plugin_attrib_map = {} diff --git a/sleekxmpp/stanza/rootstanza.py b/sleekxmpp/stanza/rootstanza.py index bb756acb..a7c2b218 100644 --- a/sleekxmpp/stanza/rootstanza.py +++ b/sleekxmpp/stanza/rootstanza.py @@ -78,7 +78,8 @@ class RootStanza(StanzaBase): self['error']['type'] = 'cancel' self.send() # log the error - log.exception('Error handling {%s}%s stanza' , self.namespace, self.name) + log.exception('Error handling {%s}%s stanza', + self.namespace, self.name) # Finally raise the exception to a global exception handler self.stream.exception(e) diff --git a/sleekxmpp/stanza/roster.py b/sleekxmpp/stanza/roster.py index 3fae42cc..a415c482 100644 --- a/sleekxmpp/stanza/roster.py +++ b/sleekxmpp/stanza/roster.py @@ -47,7 +47,7 @@ class Roster(ElementBase): roster versioning. """ return self.xml.attrib.get('ver', None) - + def set_ver(self, ver): """ Ensure handling an empty ver attribute propery. @@ -101,7 +101,7 @@ class Roster(ElementBase): items[item['jid']] = item.values # Remove extra JID reference to keep everything # backward compatible - del items[item['jid']]['jid'] + del items[item['jid']]['jid'] del items[item['jid']]['lang'] return items diff --git a/sleekxmpp/stanza/stream_error.py b/sleekxmpp/stanza/stream_error.py index bf77d932..8c541da4 100644 --- a/sleekxmpp/stanza/stream_error.py +++ b/sleekxmpp/stanza/stream_error.py @@ -79,4 +79,3 @@ class StreamError(Error, StanzaBase): def del_see_other_host(self): self._del_sub('{%s}see-other-host' % self.condition_ns) - |