[meld/deprecation-cleanup] Remove remaining pyobject accesses

[Kai Willadsen <kaiw src gnome org>]

commit b637874a53ce137e7facfe81bcdb838a56943ffe
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Mon Dec 10 07:27:00 2018 +1000

    Remove remaining pyobject accesses
    
    Since these are all templated, the pyobjects *are* the widgets.

 meld/dirdiff.py     |  4 ----
 meld/filediff.py    |  4 ----
 meld/meldwindow.py  | 18 ++++++++----------
 meld/newdifftab.py  |  4 ----
 meld/ui/notebook.py |  4 ++--
 meld/vcview.py      |  4 ----
 6 files changed, 10 insertions(+), 28 deletions(-)
---
diff --git a/meld/dirdiff.py b/meld/dirdiff.py
index 76e0bd3b..506416fd 100644
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@ -538,10 +538,6 @@ class DirDiff(Gtk.VBox, tree.TreeviewCommon, MeldDoc):
 
         self._scan_in_progress = 0
 
-        # FIXME: Awful migration hack; this means that we don't have to
-        # address `.pyobject` access before all tab types are updated.
-        self.pyobject = self
-
     def queue_draw(self):
         for treeview in self.treeview:
             treeview.queue_draw()
diff --git a/meld/filediff.py b/meld/filediff.py
index 261f64f0..99fc19ea 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -339,10 +339,6 @@ class FileDiff(Gtk.VBox, MeldDoc):
 
         self.connect("notify::ignore-blank-lines", self.refresh_comparison)
 
-        # FIXME: Awful migration hack; this means that we don't have to
-        # address `.pyobject` access before all tab types are updated.
-        self.pyobject = self
-
     def on_container_switch_in_event(self, ui):
         MeldDoc.on_container_switch_in_event(self, ui)
 
diff --git a/meld/meldwindow.py b/meld/meldwindow.py
index 1654f5c5..27ce4b28 100644
--- a/meld/meldwindow.py
+++ b/meld/meldwindow.py
@@ -265,8 +265,7 @@ class MeldWindow(Gtk.ApplicationWindow):
         should_cancel = False
         # Delete pages from right-to-left.  This ensures that if a version
         # control page is open in the far left page, it will be closed last.
-        for c in reversed(self.notebook.get_children()):
-            page = c.pyobject
+        for page in reversed(self.notebook.get_children()):
             self.notebook.set_current_page(self.notebook.page_num(page))
             response = page.on_delete_event()
             if response == Gtk.ResponseType.CANCEL:
@@ -284,7 +283,7 @@ class MeldWindow(Gtk.ApplicationWindow):
         current_page = self.notebook.get_current_page()
 
         if current_page != -1:
-            page = self.notebook.get_nth_page(current_page).pyobject
+            page = self.notebook.get_nth_page(current_page)
         else:
             page = None
 
@@ -316,10 +315,10 @@ class MeldWindow(Gtk.ApplicationWindow):
     def on_switch_page(self, notebook, page, which):
         oldidx = notebook.get_current_page()
         if oldidx >= 0:
-            olddoc = notebook.get_nth_page(oldidx).pyobject
+            olddoc = notebook.get_nth_page(oldidx)
             self.handle_current_doc_switch(olddoc)
 
-        newdoc = notebook.get_nth_page(which).pyobject if which >= 0 else None
+        newdoc = notebook.get_nth_page(which) if which >= 0 else None
         try:
             undoseq = newdoc.undosequence
             can_undo = undoseq.can_undo()
@@ -355,7 +354,7 @@ class MeldWindow(Gtk.ApplicationWindow):
 
     @Template.Callback()
     def after_switch_page(self, notebook, page, which):
-        newdoc = notebook.get_nth_page(which).pyobject
+        newdoc = notebook.get_nth_page(which)
         newdoc.on_container_switch_in_event(self.ui)
         self._update_page_action_sensitivity()
 
@@ -399,7 +398,7 @@ class MeldWindow(Gtk.ApplicationWindow):
     def on_menu_close_activate(self, *extra):
         i = self.notebook.get_current_page()
         if i >= 0:
-            page = self.notebook.get_nth_page(i).pyobject
+            page = self.notebook.get_nth_page(i)
             page.on_delete_event()
 
     def on_menu_undo_activate(self, *extra):
@@ -499,8 +498,7 @@ class MeldWindow(Gtk.ApplicationWindow):
             self.should_close = False
 
     def on_file_changed(self, srcpage, filename):
-        for c in self.notebook.get_children():
-            page = c.pyobject
+        for page in self.notebook.get_children():
             if page != srcpage:
                 page.on_file_changed(filename)
 
@@ -656,7 +654,7 @@ class MeldWindow(Gtk.ApplicationWindow):
         "Get the current doc or a dummy object if there is no current"
         index = self.notebook.get_current_page()
         if index >= 0:
-            page = self.notebook.get_nth_page(index).pyobject
+            page = self.notebook.get_nth_page(index)
             if isinstance(page, MeldDoc):
                 return page
 
diff --git a/meld/newdifftab.py b/meld/newdifftab.py
index bbc3ef01..468002a9 100644
--- a/meld/newdifftab.py
+++ b/meld/newdifftab.py
@@ -96,10 +96,6 @@ class NewDiffTab(Gtk.Alignment, LabeledObjectMixin):
 
         self.show()
 
-        # FIXME: Awful migration hack; this means that we don't have to
-        # address `.pyobject` access before all tab types are updated.
-        self.pyobject = self
-
     @Template.Callback()
     def on_button_type_toggled(self, button, *args):
         if not button.get_active():
diff --git a/meld/ui/notebook.py b/meld/ui/notebook.py
index 29af7f8a..a29a3d5e 100644
--- a/meld/ui/notebook.py
+++ b/meld/ui/notebook.py
@@ -150,10 +150,10 @@ class MeldNotebook(Gtk.Notebook):
         self.reorder_child(child, page_num + 1)
 
     def on_page_added(self, notebook, child, page_num, *args):
-        child.pyobject.connect("label-changed", self.on_label_changed)
+        child.connect("label-changed", self.on_label_changed)
 
     def on_page_removed(self, notebook, child, page_num, *args):
-        child.pyobject.disconnect_by_func(self.on_label_changed)
+        child.disconnect_by_func(self.on_label_changed)
 
     def on_label_changed(self, page, text, tooltip):
         nbl = self.get_tab_label(page)
diff --git a/meld/vcview.py b/meld/vcview.py
index e531a6b1..85cc576e 100644
--- a/meld/vcview.py
+++ b/meld/vcview.py
@@ -239,10 +239,6 @@ class VcView(Gtk.VBox, tree.TreeviewCommon, MeldDoc):
                 self.actiongroup.get_action(
                     self.state_actions[s][0]).set_active(True)
 
-        # FIXME: Awful migration hack; this means that we don't have to
-        # address `.pyobject` access before all tab types are updated.
-        self.pyobject = self
-
     def _set_external_action_sensitivity(self, focused):
         try:
             self.main_actiongroup.get_action("OpenExternal").set_sensitive(