[meld: 10/63] filediff, filemerge: Remove our now-unneeded file load shim



commit 1fda7bdaf3427c39f93b8d6990edaea58a7762a0
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sun Jul 19 10:24:00 2015 +1000

    filediff, filemerge: Remove our now-unneeded file load shim

 meld/filediff.py  |    5 +----
 meld/filemerge.py |    3 ---
 2 files changed, 1 insertions(+), 7 deletions(-)
---
diff --git a/meld/filediff.py b/meld/filediff.py
index e741484..64513b5 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -1034,7 +1034,7 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
         self.recompute_label()
         self.textview[len(files) >= 2].grab_focus()
         self._connect_buffer_handlers()
-        self._set_files_internal(files)
+        self._load_files(files, self.textbuffer)
 
     def get_comparison(self):
         files = [b.data.filename for b in self.textbuffer[:self.num_panes]]
@@ -1149,9 +1149,6 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
         for i in range(self.num_panes):
             self.textbuffer[i].set_language(langs[i])
 
-    def _set_files_internal(self, files):
-        self._load_files(files, self.textbuffer)
-
     def _compare_files_internal(self):
         for i in self._diff_files():
             yield i
diff --git a/meld/filemerge.py b/meld/filemerge.py
index c3f4a7d..f44afab 100644
--- a/meld/filemerge.py
+++ b/meld/filemerge.py
@@ -33,9 +33,6 @@ class FileMerge(filediff.FileDiff):
         comp = filediff.FileDiff.get_comparison(self)
         return recent.TYPE_MERGE, comp[1]
 
-    def _set_files_internal(self, files):
-        self._load_files(files, self.textbuffer)
-
     def _compare_files_internal(self):
         for i in self._merge_files():
             yield i


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]