super

OceanWolf · OceanWolf · commit c44e74443f9c · 2016-08-04T01:37:31.000+02:00
diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
@@ -2639,8 +2639,8 @@ class WindowBase(cbook.EventEmitter):
         The title of the window.
     """
 
-    def __init__(self, title):
-        cbook.EventEmitter.__init__(self)
+    def __init__(self, title, **kwargs):
+        super(WindowBase, self).__init__(**kwargs)
 
     def show(self):
         """
@@ -3349,7 +3349,8 @@ class ToolContainerBase(object):
         this `ToolContainer` wants to communicate with.
     """
 
-    def __init__(self, toolmanager):
+    def __init__(self, toolmanager, **kwargs):
+        super(ToolContainerBase, self).__init__(**kwargs)
         self.toolmanager = toolmanager
         self.toolmanager.toolmanager_connect('tool_removed_event',
                                              self._remove_tool_cbk)
@@ -3475,7 +3476,8 @@ def remove_toolitem(self, name):
 
 class StatusbarBase(object):
     """Base class for the statusbar"""
-    def __init__(self, toolmanager):
+    def __init__(self, toolmanager, **kwargs):
+        super(StatusbarBase, self).__init__(**kwargs)
         self.toolmanager = toolmanager
         self.toolmanager.toolmanager_connect('tool_message_event',
                                              self._message_cbk)
diff --git a/lib/matplotlib/backend_managers.py b/lib/matplotlib/backend_managers.py
@@ -74,7 +74,7 @@ class FigureManager(cbook.EventEmitter):
         The figure number.
     """
     def __init__(self, figure, num):
-        cbook.EventEmitter.__init__(self)
+        super(FigureManager, self).__init__()
         self.num = num
 
         self._backend = get_backend()
diff --git a/lib/matplotlib/backends/backend_gtk3.py b/lib/matplotlib/backends/backend_gtk3.py
@@ -391,9 +391,8 @@ def stop_event_loop(self):
 
 
 class WindowGTK3(WindowBase, Gtk.Window):
-    def __init__(self, title):
-        WindowBase.__init__(self, title)
-        Gtk.Window.__init__(self)
+    def __init__(self, title, **kwargs):
+        super(WindowGTK3, self).__init__(title=title, **kwargs)
         self.set_window_title(title)
 
         try:
@@ -829,8 +828,7 @@ def draw_rubberband(self, x0, y0, x1, y1):
 
 class ToolbarGTK3(ToolContainerBase, Gtk.Box):
     def __init__(self, toolmanager, flow='horizontal'):
-        ToolContainerBase.__init__(self, toolmanager)
-        Gtk.Box.__init__(self)
+        super(ToolbarGTK3, self).__init__(toolmanager=toolmanager)
         self._toolarea = Gtk.Box()
         self.set_flow(flow)
 
@@ -917,8 +915,7 @@ def _add_separator(self):
 
 class StatusbarGTK3(StatusbarBase, Gtk.Statusbar):
     def __init__(self, *args, **kwargs):
-        StatusbarBase.__init__(self, *args, **kwargs)
-        Gtk.Statusbar.__init__(self)
+        super(StatusbarGTK3, self).__init__(*args, **kwargs)
         self._context = self.get_context_id('message')
 
     def set_message(self, s):
diff --git a/lib/matplotlib/cbook.py b/lib/matplotlib/cbook.py
@@ -545,6 +545,7 @@ def process(self, s, *args, **kwargs):
 
 class EventEmitter(object):
     def __init__(self):
+        super(EventEmitter, self).__init__()
         self._callbacks = CallbackRegistry()
 
     def mpl_connect(self, s, func):
