diff options
| author | mathieui <mathieui@mathieui.net> | 2016-09-30 21:25:36 +0200 |
|---|---|---|
| committer | mathieui <mathieui@mathieui.net> | 2016-09-30 21:25:36 +0200 |
| commit | 46a90749f839c3d64aa05458cef825f56e9c702d (patch) | |
| tree | 207a8e9228f6b6b7efde2cef405bf712a505860e /slixmpp | |
| parent | 0c63a4bbdafcb557430e02f774dc88c5f2a974c1 (diff) | |
| download | slixmpp-46a90749f839c3d64aa05458cef825f56e9c702d.tar.gz slixmpp-46a90749f839c3d64aa05458cef825f56e9c702d.tar.bz2 slixmpp-46a90749f839c3d64aa05458cef825f56e9c702d.tar.xz slixmpp-46a90749f839c3d64aa05458cef825f56e9c702d.zip | |
Fix uses of super() in the codebase
Fix #3165, we don’t need to use the long form to get the superobject in
our supported python versions.
Diffstat (limited to 'slixmpp')
| -rw-r--r-- | slixmpp/exceptions.py | 4 | ||||
| -rw-r--r-- | slixmpp/plugins/base.py | 2 | ||||
| -rw-r--r-- | slixmpp/plugins/xep_0054/stanza.py | 2 |
3 files changed, 4 insertions, 4 deletions
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) |