From 46a90749f839c3d64aa05458cef825f56e9c702d Mon Sep 17 00:00:00 2001 From: mathieui Date: Fri, 30 Sep 2016 21:25:36 +0200 Subject: Fix uses of super() in the codebase MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix #3165, we don’t need to use the long form to get the superobject in our supported python versions. --- slixmpp/exceptions.py | 4 ++-- slixmpp/plugins/base.py | 2 +- slixmpp/plugins/xep_0054/stanza.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'slixmpp') diff --git a/slixmpp/exceptions.py b/slixmpp/exceptions.py index a6c09a0b..0486666e 100644 --- a/slixmpp/exceptions.py +++ b/slixmpp/exceptions.py @@ -77,7 +77,7 @@ class IqTimeout(XMPPError): """ def __init__(self, iq): - super(IqTimeout, self).__init__( + super().__init__( condition='remote-server-timeout', etype='cancel') @@ -94,7 +94,7 @@ class IqError(XMPPError): """ def __init__(self, iq): - super(IqError, self).__init__( + super().__init__( condition=iq['error']['condition'], text=iq['error']['text'], etype=iq['error']['type']) diff --git a/slixmpp/plugins/base.py b/slixmpp/plugins/base.py index 0fe083bc..3196e0ea 100644 --- a/slixmpp/plugins/base.py +++ b/slixmpp/plugins/base.py @@ -308,7 +308,7 @@ class BasePlugin(object): if key in self.default_config: self.config[key] = value else: - super(BasePlugin, self).__setattr__(key, value) + super().__setattr__(key, value) def _init(self): """Initialize plugin state, such as registering event handlers. diff --git a/slixmpp/plugins/xep_0054/stanza.py b/slixmpp/plugins/xep_0054/stanza.py index 48a41432..e7647184 100644 --- a/slixmpp/plugins/xep_0054/stanza.py +++ b/slixmpp/plugins/xep_0054/stanza.py @@ -127,7 +127,7 @@ class Telephone(ElementBase): 'ISDN', 'PCS', 'PREF']) def setup(self, xml=None): - super(Telephone, self).setup(xml=xml) + super().setup(xml=xml) ## this blanks out numbers received from server ##self._set_sub_text('NUMBER', '', keep=True) -- cgit v1.2.3