[meld] dirdiff: Don't treat TreePaths as being hashable

[Kai Willadsen <kaiw src gnome org>]

commit e6d4a91a7169d8f10d53d2e9f6556918c0c4e83c
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Thu Feb 4 06:11:28 2016 +1000

    dirdiff: Don't treat TreePaths as being hashable
    
    They aren't hashable when running under Python 3, and really shouldn't
    be in any case, given their in-place mutability.

 meld/dirdiff.py |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/meld/dirdiff.py b/meld/dirdiff.py
index 70a9ab4..a7cffca 100644
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@ -674,6 +674,8 @@ class DirDiff(melddoc.MeldDoc, gnomeglade.Component):
         todo = [rootpath]
         expanded = set()
 
+        tuple_tree_path = lambda p: tuple(p.get_indices())
+
         shadowed_entries = []
         invalid_filenames = []
         while len(todo):
@@ -783,7 +785,7 @@ class DirDiff(melddoc.MeldDoc, gnomeglade.Component):
                         not all(os.path.isdir(f) for f in roots)):
                     self.model.add_empty(it)
                     if self.model.iter_parent(it) is None:
-                        expanded.add(rootpath)
+                        expanded.add(tuple_tree_path(rootpath))
                 else:
                     # At this point, we have an empty folder tree node; we can
                     # prune this and any ancestors that then end up empty.
@@ -794,7 +796,7 @@ class DirDiff(melddoc.MeldDoc, gnomeglade.Component):
                         # no siblings. If we're here, we have an empty tree.
                         if parent is None:
                             self.model.add_empty(it)
-                            expanded.add(rootpath)
+                            expanded.add(tuple_tree_path(rootpath))
                             break
 
                         # Remove the current row, and then revalidate all
@@ -810,7 +812,7 @@ class DirDiff(melddoc.MeldDoc, gnomeglade.Component):
                         it = parent
 
             if differences:
-                expanded.add(path)
+                expanded.add(tuple_tree_path(path))
 
         if invalid_filenames or shadowed_entries:
             self._show_tree_wide_errors(invalid_filenames, shadowed_entries)
@@ -819,7 +821,7 @@ class DirDiff(melddoc.MeldDoc, gnomeglade.Component):
 
         self.treeview[0].expand_to_path(Gtk.TreePath(("0",)))
         for path in sorted(expanded):
-            self.treeview[0].expand_to_path(path)
+            self.treeview[0].expand_to_path(Gtk.TreePath(path))
         yield _("[%s] Done") % self.label_text
 
         self.scheduler.add_task(self.on_treeview_cursor_changed)