[meld/Python3] patchdialog: Remove difflib hack; in py3k difflib handles unicode paths



commit 24f29bf7493a172de160bcf5057e23c7b3e141b1
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sun Jul 24 11:46:11 2016 +1000

    patchdialog: Remove difflib hack; in py3k difflib handles unicode paths

 meld/patchdialog.py |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)
---
diff --git a/meld/patchdialog.py b/meld/patchdialog.py
index 134f665..c0db940 100644
--- a/meld/patchdialog.py
+++ b/meld/patchdialog.py
@@ -90,16 +90,13 @@ class PatchDialog(gnomeglade.Component):
         names = [self.filediff.textbuffer[i].data.label for i in range(3)]
         prefix = os.path.commonprefix(names)
         names = [n[prefix.rfind("/") + 1:] for n in names]
-        # difflib doesn't handle getting unicode file labels
-        names = [n.encode('utf8') for n in names]
 
         buf = self.textview.get_buffer()
         text0, text1 = texts[indices[0]], texts[indices[1]]
         name0, name1 = names[indices[0]], names[indices[1]]
 
         diff = difflib.unified_diff(text0, text1, name0, name1)
-        unicodeify = lambda x: x.decode('utf8') if isinstance(x, bytes) else x
-        diff_text = "".join(unicodeify(d) for d in diff)
+        diff_text = "".join(d for d in diff)
         buf.set_text(diff_text)
 
     def save_patch(self, filename):


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