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.
This commit is contained in:
mathieui
2016-09-30 21:25:36 +02:00
parent 0c63a4bbda
commit 46a90749f8
9 changed files with 12 additions and 12 deletions

View File

@@ -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'])

View File

@@ -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.

View File

@@ -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)