From d92aa05b5c18806ab5addc947eeedaaf4d51500e Mon Sep 17 00:00:00 2001 From: Lance Stout Date: Tue, 19 Jun 2012 01:29:48 -0700 Subject: PEP8 formatting updates. --- sleekxmpp/features/__init__.py | 6 +++--- sleekxmpp/features/feature_mechanisms/stanza/auth.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'sleekxmpp/features') diff --git a/sleekxmpp/features/__init__.py b/sleekxmpp/features/__init__.py index c63d72bf..1ef1e0cf 100644 --- a/sleekxmpp/features/__init__.py +++ b/sleekxmpp/features/__init__.py @@ -7,9 +7,9 @@ """ __all__ = [ - 'feature_starttls', - 'feature_mechanisms', - 'feature_bind', + 'feature_starttls', + 'feature_mechanisms', + 'feature_bind', 'feature_session', 'feature_rosterver' ] diff --git a/sleekxmpp/features/feature_mechanisms/stanza/auth.py b/sleekxmpp/features/feature_mechanisms/stanza/auth.py index 69769507..8b9d18b6 100644 --- a/sleekxmpp/features/feature_mechanisms/stanza/auth.py +++ b/sleekxmpp/features/feature_mechanisms/stanza/auth.py @@ -23,7 +23,7 @@ class Auth(StanzaBase): interfaces = set(('mechanism', 'value')) plugin_attrib = name - #: Some SASL mechs require sending values as is, + #: Some SASL mechs require sending values as is, #: without converting base64. plain_mechs = set(['X-MESSENGER-OAUTH2']) -- cgit v1.2.3 From 7858d969d82eaaa7124b8d59a68c286f06cbf758 Mon Sep 17 00:00:00 2001 From: Lance Stout Date: Tue, 19 Jun 2012 09:47:31 -0700 Subject: Remove usage of deprecated getchildren() method. --- sleekxmpp/features/feature_mechanisms/stanza/failure.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sleekxmpp/features') diff --git a/sleekxmpp/features/feature_mechanisms/stanza/failure.py b/sleekxmpp/features/feature_mechanisms/stanza/failure.py index 5dd0de56..b9f32605 100644 --- a/sleekxmpp/features/feature_mechanisms/stanza/failure.py +++ b/sleekxmpp/features/feature_mechanisms/stanza/failure.py @@ -47,7 +47,7 @@ class Failure(StanzaBase): def get_condition(self): """Return the condition element's name.""" - for child in self.xml.getchildren(): + for child in self.xml: if "{%s}" % self.namespace in child.tag: cond = child.tag.split('}', 1)[-1] if cond in self.conditions: @@ -68,7 +68,7 @@ class Failure(StanzaBase): def del_condition(self): """Remove the condition element.""" - for child in self.xml.getchildren(): + for child in self.xml: if "{%s}" % self.condition_ns in child.tag: tag = child.tag.split('}', 1)[-1] if tag in self.conditions: -- cgit v1.2.3