[meld] filemerge: Get rid of explicit relative import



commit adad6726eac916faf4ab64a83fcd84f41c4ac4bc
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sat Dec 23 07:54:03 2017 +1000

    filemerge: Get rid of explicit relative import

 meld/filemerge.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/meld/filemerge.py b/meld/filemerge.py
index 57e3b6e3..9f02f4bb 100644
--- a/meld/filemerge.py
+++ b/meld/filemerge.py
@@ -15,22 +15,22 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from meld.conf import _
-from . import filediff
+from meld.filediff import FileDiff
 from meld.matchers import merge
 from meld.recent import RecentType
 
 
-class FileMerge(filediff.FileDiff):
+class FileMerge(FileDiff):
 
     differ = merge.AutoMergeDiffer
 
     def _connect_buffer_handlers(self):
-        filediff.FileDiff._connect_buffer_handlers(self)
+        FileDiff._connect_buffer_handlers(self)
         self.textview[0].set_editable(0)
         self.textview[2].set_editable(0)
 
     def get_comparison(self):
-        comp = filediff.FileDiff.get_comparison(self)
+        comp = FileDiff.get_comparison(self)
         return RecentType.Merge, comp[1]
 
     def _merge_files(self):


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