From 90baa3cf2db4b0889a02d1509c25eb0316ad78e1 Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Tue, 21 Oct 2014 15:39:23 -0400 Subject: fix things under python 2 --- t/__init__.py | 2 +- t/processing_test.py | 1 + t/text_test.py | 25 +++++++++++++------------ 3 files changed, 15 insertions(+), 13 deletions(-) (limited to 't') diff --git a/t/__init__.py b/t/__init__.py index 130a085..b7a4f12 100644 --- a/t/__init__.py +++ b/t/__init__.py @@ -7,7 +7,7 @@ class VT100Test(unittest.TestCase): self.vt = vt100.vt100(24, 80) def process(self, text): - if type(text) == type(""): + if type(text) == type(u""): length = len(text.encode("utf-8")) else: length = len(text) diff --git a/t/processing_test.py b/t/processing_test.py index 70b1000..7208374 100644 --- a/t/processing_test.py +++ b/t/processing_test.py @@ -1,3 +1,4 @@ +# coding=utf-8 from . import VT100Test class ProcessingTest(VT100Test): diff --git a/t/text_test.py b/t/text_test.py index c73801d..6a3add0 100644 --- a/t/text_test.py +++ b/t/text_test.py @@ -1,3 +1,4 @@ +# coding=utf-8 from . import VT100Test class TextTest(VT100Test): @@ -16,11 +17,11 @@ class TextTest(VT100Test): assert self.vt.cell(0, 0).contents() == "c" assert self.vt.cell(0, 1).contents() == "a" assert self.vt.cell(0, 2).contents() == "f" - assert self.vt.cell(0, 3).contents() == "é" + assert self.vt.cell(0, 3).contents() == u"é" assert self.vt.cell(0, 4).contents() == "" assert self.vt.cell(1, 0).contents() == "" - assert self.vt.get_string_plaintext(0, 0, 23, 79) == 'café' + ('\n' * 24) - assert self.vt.get_string_plaintext(0, 0, 500, 500) == 'café' + ('\n' * 24) + assert self.vt.get_string_plaintext(0, 0, 23, 79) == u'café' + ('\n' * 24) + assert self.vt.get_string_plaintext(0, 0, 500, 500) == u'café' + ('\n' * 24) def test_newlines(self): self.process("f\r\noo\r\nood") @@ -41,29 +42,29 @@ class TextTest(VT100Test): def test_wide(self): self.process("aデbネ") assert self.vt.cell(0, 0).contents() == "a" - assert self.vt.cell(0, 1).contents() == "デ" + assert self.vt.cell(0, 1).contents() == u"デ" assert self.vt.cell(0, 2).contents() == "" assert self.vt.cell(0, 3).contents() == "b" - assert self.vt.cell(0, 4).contents() == "ネ" + assert self.vt.cell(0, 4).contents() == u"ネ" assert self.vt.cell(0, 5).contents() == "" assert self.vt.cell(0, 6).contents() == "" assert self.vt.cell(1, 0).contents() == "" print(self.vt.get_string_plaintext(0, 0, 0, 50)) - assert self.vt.get_string_plaintext(0, 0, 23, 79) == 'aデbネ' + ('\n' * 24) - assert self.vt.get_string_plaintext(0, 0, 500, 500) == 'aデbネ' + ('\n' * 24) + assert self.vt.get_string_plaintext(0, 0, 23, 79) == u'aデbネ' + ('\n' * 24) + assert self.vt.get_string_plaintext(0, 0, 500, 500) == u'aデbネ' + ('\n' * 24) def test_combining(self): self.process("a") assert self.vt.cell(0, 0).contents() == "a" - self.process("\u0301") - assert self.vt.cell(0, 0).contents() == "á" + self.process(u"\u0301".encode('utf-8')) + assert self.vt.cell(0, 0).contents() == u"á" self.process("\033[20;20Habcdefg") assert self.vt.get_string_plaintext(19, 19, 19, 26) == "abcdefg" - self.process("\033[20;25H\u0301") - assert self.vt.get_string_plaintext(19, 19, 19, 26) == "abcdéfg" + self.process(u"\033[20;25H\u0301".encode('utf-8')) + assert self.vt.get_string_plaintext(19, 19, 19, 26) == u"abcdéfg" self.process("\033[10;78Haaa") assert self.vt.cell(9, 79).contents() == "a" - self.process("\r\n\u0301") + self.process(u"\r\n\u0301".encode('utf-8')) assert self.vt.cell(9, 79).contents() == "a" assert self.vt.cell(10, 0).contents() == "" -- cgit v1.2.3