Calling super() whenever possible

Author: claudep

meld/build_helpers.py

@@ -65,7 +65,7 @@ class MeldDistribution(distutils.dist.Distribution):
     def __init__(self, *args, **kwargs):
         self.no_update_icon_cache = False
         self.no_compile_schemas = False
-        distutils.dist.Distribution.__init__(self, *args, **kwargs)
+        super().__init__(*args, **kwargs)
 
 
 class build_data(distutils.cmd.Command):

meld/diffgrid.py

@@ -22,7 +22,7 @@ class DiffGrid(Gtk.Grid):
     __gtype_name__ = "DiffGrid"
 
     def __init__(self):
-        Gtk.Grid.__init__(self)
+        super().__init__()
         self._in_drag = False
         self._drag_pos = -1
         self._drag_handle = None

meld/diffmap.py

@@ -29,7 +29,7 @@ class DiffMap(Gtk.DrawingArea):
     __gtype_name__ = "DiffMap"
 
     def __init__(self):
-        Gtk.DrawingArea.__init__(self)
+        super().__init__()
         self.add_events(Gdk.EventMask.BUTTON_PRESS_MASK)
         self._last_allocation = None
         self._scrolladj = None

meld/dirdiff.py

@@ -206,8 +206,7 @@ def _files_same(files, regexes, comparison_args):
 
 class DirDiffTreeStore(tree.DiffTreeStore):
     def __init__(self, ntree):
-        tree.DiffTreeStore.__init__(
-            self, ntree, [str, str, object, object, object])
+        super().__init__(ntree, [str, str, object, object, object])
 
 
 class CanonicalListing:

meld/filemerge.py

@@ -25,12 +25,12 @@ class FileMerge(FileDiff):
     differ = merge.AutoMergeDiffer
 
     def _connect_buffer_handlers(self):
-        FileDiff._connect_buffer_handlers(self)
+        super()._connect_buffer_handlers()
         self.textview[0].set_editable(0)
         self.textview[2].set_editable(0)
 
     def get_comparison(self):
-        comp = FileDiff.get_comparison(self)
+        comp = super().get_comparison()
         return RecentType.Merge, comp[1]
 
     def _merge_files(self):

meld/matchers/diffutil.py

@@ -78,7 +78,7 @@ class Differ(GObject.GObject):
 
     def __init__(self):
         # Internally, diffs are stored from text1 -> text0 and text1 -> text2.
-        GObject.GObject.__init__(self)
+        super().__init__()
         self.num_sequences = 0
         self.seqlength = [0, 0, 0]
         self.diffs = [[], []]

meld/matchers/merge.py

@@ -23,12 +23,12 @@ class AutoMergeDiffer(diffutil.Differ):
     # _matcher = PatienceSequenceMatcher
 
     def __init__(self):
-        diffutil.Differ.__init__(self)
+        super().__init__()
         self.auto_merge = False
         self.unresolved = []
 
     def _auto_merge(self, using, texts):
-        for out0, out1 in diffutil.Differ._auto_merge(self, using, texts):
+        for out0, out1 in super()._auto_merge(using, texts):
             if self.auto_merge and out0[0] == 'conflict':
                 # we will try to resolve more complex conflicts automatically
                 # here... if possible
@@ -195,8 +195,7 @@ def change_sequence(self, sequence, startidx, sizechange, texts):
                     ]
                 self.unresolved[lo:hi] = []
 
-        return diffutil.Differ.change_sequence(
-            self, sequence, startidx, sizechange, texts)
+        return super().change_sequence(sequence, startidx, sizechange, texts)
 
     def get_unresolved_count(self):
         return len(self.unresolved)

meld/matchers/myers.py

@@ -83,7 +83,7 @@ def get_matching_blocks(self):
         return self.matching_blocks
 
     def get_opcodes(self):
-        opcodes = difflib.SequenceMatcher.get_opcodes(self)
+        opcodes = super().get_opcodes()
         return [DiffChunk._make(chunk) for chunk in opcodes]
 
     def get_difference_opcodes(self):
@@ -349,13 +349,13 @@ def index_matching_kmers(a, b):
 class SyncPointMyersSequenceMatcher(MyersSequenceMatcher):
 
     def __init__(self, isjunk=None, a="", b="", syncpoints=None):
-        MyersSequenceMatcher.__init__(self, isjunk, a, b)
+        super().__init__(isjunk, a, b)
         self.isjunk = isjunk
         self.syncpoints = syncpoints
 
     def initialise(self):
         if self.syncpoints is None or len(self.syncpoints) == 0:
-            for i in MyersSequenceMatcher.initialise(self):
+            for i in super().initialise():
                 yield i
         else:
             chunks = []

meld/meldapp.py

@@ -43,7 +43,7 @@
 class MeldApp(Gtk.Application):
 
     def __init__(self):
-        Gtk.Application.__init__(self)
+        super().__init__()
         self.set_flags(Gio.ApplicationFlags.HANDLES_COMMAND_LINE)
         self.set_application_id("org.gnome.meld")
         GLib.set_application_name("Meld")
@@ -200,7 +200,7 @@ def __init__(self, command_line, *args, **kwargs):
                 self.should_exit = False
                 self.output = io.StringIO()
                 self.exit_status = 0
-                optparse.OptionParser.__init__(self, *args, **kwargs)
+                super().__init__(*args, **kwargs)
 
             def exit(self, status=0, msg=None):
                 self.should_exit = True

meld/meldbuffer.py

@@ -37,7 +37,7 @@ class MeldBuffer(GtkSource.Buffer):
     )
 
     def __init__(self):
-        GtkSource.Buffer.__init__(self)
+        super().__init__()
         bind_settings(self)
         self.data = MeldBufferData()
         self.undo_sequence = None
@@ -98,7 +98,7 @@ class MeldBufferData(GObject.GObject):
     )
 
     def __init__(self):
-        GObject.GObject.__init__(self)
+        super().__init__()
         self._gfile = None
         self._label = None
         self._monitor = None