pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

super(...).method(...) => BaseClass.method(self, ...)

Browse source
This commit is contained in:
Gina Häußge 2015-06-19 15:25:37 +02:00
parent f58d63bb49
commit 904a3cdaff
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/octoprint/plugin/core.py
View file

@ -1215,13 +1215,13 @@ class RestartNeedingPlugin(Plugin):
class PluginNeedsRestart(BaseException):
def __init__(self, name):
super(BaseException, self).__init__()
BaseException.__init__(self)
self.name = name
self.message = "Plugin {name} cannot be enabled or disabled after system startup".format(**locals())
class PluginLifecycleException(BaseException):
def __init__(self, name, reason, message):
super(BaseException, self).__init__()
BaseException.__init__(self)
self.name = name
self.reason = reason
@ -1232,7 +1232,7 @@ class PluginLifecycleException(BaseException):
class PluginCantInitialize(PluginLifecycleException):
def __init__(self, name, reason):
super(PluginLifecycleException, self).__init__(name, reason, "Plugin {name} cannot be initialized: {reason}")
PluginLifecycleException.__init__(self, name, reason, "Plugin {name} cannot be initialized: {reason}")
class PluginCantEnable(PluginLifecycleException):
def __init__(self, name, reason):
@ -1240,4 +1240,4 @@ class PluginCantEnable(PluginLifecycleException):
class PluginCantDisable(PluginLifecycleException):
def __init__(self, name, reason):
super(PluginLifecycleException, self).__init__(name, reason, "Plugin {name} cannot be disabled: {reason}")
PluginLifecycleException.__init__(self, name, reason, "Plugin {name} cannot be disabled: {reason}")

14
src/octoprint/slicing/exceptions.py
View file

@ -54,7 +54,7 @@ class SlicerException(SlicingException):
Identifier of the slicer for which the exception was raised.
"""
def __init__(self, slicer, *args, **kwargs):
super(SlicingException, self).__init__(*args, **kwargs)
SlicingException.__init__(self, *args, **kwargs)
self.slicer = slicer
class SlicerNotConfigured(SlicerException):
@ -62,7 +62,7 @@ class SlicerNotConfigured(SlicerException):
Raised if a slicer is not yet configured but must be configured to proceed.
"""
def __init__(self, slicer, *args, **kwargs):
super(SlicerException, self).__init__(slicer, *args, **kwargs)
SlicerException.__init__(self, slicer, *args, **kwargs)
self.message = "Slicer not configured: {slicer}".format(slicer=slicer)
class UnknownSlicer(SlicerException):
@ -70,7 +70,7 @@ class UnknownSlicer(SlicerException):
Raised if a slicer is unknown.
"""
def __init__(self, slicer, *args, **kwargs):
super(SlicerException, self).__init__(slicer, *args, **kwargs)
SlicerException.__init__(self, slicer, *args, **kwargs)
self.message = "No such slicer: {slicer}".format(slicer=slicer)
class ProfileException(BaseException):
@ -86,7 +86,7 @@ class ProfileException(BaseException):
Identifier of the profile for which the exception was raised.
"""
def __init__(self, slicer, profile, *args, **kwargs):
super(BaseException, self).__init__(*args, **kwargs)
BaseException.__init__(self, *args, **kwargs)
self.slicer = slicer
self.profile = profile
@ -95,7 +95,7 @@ class UnknownProfile(ProfileException):
Raised if a slicing profile does not exist but must exist to proceed.
"""
def __init__(self, slicer, profile, *args, **kwargs):
super(ProfileException, self).__init__(slicer, profile, *args, **kwargs)
ProfileException.__init__(self, slicer, profile, *args, **kwargs)
self.message = "Profile {profile} for slicer {slicer} does not exist".format(profile=profile, slicer=slicer)
class ProfileAlreadyExists(ProfileException):
@ -103,5 +103,5 @@ class ProfileAlreadyExists(ProfileException):
Raised if a slicing profile already exists and must not be overwritten.
"""
def __init__(self, slicer, profile, *args, **kwargs):
super(ProfileException, self).__init__(slicer, profile, *args, **kwargs)
self.message = "Profile {profile} for slicer {slicer} already exists".format(profile=profile, slicer=slicer)
ProfileException.__init__(self, slicer, profile, *args, **kwargs)
self.message = "Profile {profile} for slicer {slicer} already exists".format(profile=profile, slicer=slicer)