[meld/Python3: 20/54] filediff: unicode/str
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld/Python3: 20/54] filediff: unicode/str
- Date: Sun, 1 May 2016 22:23:41 +0000 (UTC)
commit 7ec1ac1ac4926d098071dfaeb79a2f0db94d8874
Author: Kai Willadsen <kai willadsen gmail com>
Date: Sat Nov 14 07:04:51 2015 +1000
filediff: unicode/str
meld/filediff.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/meld/filediff.py b/meld/filediff.py
index cf516b0..2096c18 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -1489,7 +1489,7 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
text = text_type(buf.get_text(start, end, False), 'utf8')
source_encoding = bufdata.sourcefile.get_encoding()
- while isinstance(text, unicode):
+ while isinstance(text, str):
try:
encoding = source_encoding.get_charset()
text = text.encode(encoding)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]