[meld/Python3: 16/54] recent: Fix str/bytes snafu



commit 23bee65a50bf76d08371db1c8c24ab60f81b3a32
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sat Nov 14 06:54:53 2015 +1000

    recent: Fix str/bytes snafu

 meld/recent.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/meld/recent.py b/meld/recent.py
index f8065dd..9f19d5e 100644
--- a/meld/recent.py
+++ b/meld/recent.py
@@ -51,7 +51,7 @@ COMPARISON_TYPES = (TYPE_FILE, TYPE_FOLDER, TYPE_VC, TYPE_MERGE)
 def unicodeify(s):
     if s is None:
         return None
-    if isinstance(s, str):
+    if isinstance(s, bytes):
         return s.decode(sys.getfilesystemencoding(), 'replace')
     return s
 


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