diff --git a/pyreadline/py3k_compat.py b/pyreadline/py3k_compat.py index 94afeba..ab0f837 100644 --- a/pyreadline/py3k_compat.py +++ b/pyreadline/py3k_compat.py @@ -9,14 +9,18 @@ if sys.version_info[0] >= 3: def execfile(fname, glob, loc=None): loc = loc if (loc is not None) else glob - exec(compile(open(fname).read(), fname, 'exec'), glob, loc) + with open(fname) as fil: + txt = fil.read() + exec(compile(txt, fname, 'exec'), glob, loc) unicode = str bytes = bytes - + from io import StringIO else: PY3 = False callable = callable execfile = execfile bytes = str unicode = unicode + + from StringIO import StringIO diff --git a/pyreadline/test/test_vi.py b/pyreadline/test/test_vi.py index f47e3c3..1e3cb34 100644 --- a/pyreadline/test/test_vi.py +++ b/pyreadline/test/test_vi.py @@ -107,15 +107,15 @@ class Tests (unittest.TestCase): def test_simple (self): r = ViModeTest () r._set_line ('abc') - self.assert_ (r.vi_is_insert_mode) + self.assertTrue (r.vi_is_insert_mode) r.input ('"d"') - self.assert_ (r.vi_is_insert_mode) + self.assertTrue (r.vi_is_insert_mode) self.assertEqual ('abcd', r.line) r.input ('Escape') - self.assert_ (not r.vi_is_insert_mode) + self.assertTrue (not r.vi_is_insert_mode) self.assertEqual ('abcd', r.line) r.input ('"i"') - self.assert_ (r.vi_is_insert_mode) + self.assertTrue (r.vi_is_insert_mode) self.assertEqual ('abcd', r.line) r.input ('"x"') self.assertEqual ('abcxd', r.line) @@ -208,8 +208,8 @@ class Tests (unittest.TestCase): # self.assertEqual (r.console.bell_count, 1) def test_vi_is_word (self): - self.assert_ (vi_is_word ('a')) - self.assert_ (not vi_is_word (' u')) + self.assertTrue (vi_is_word ('a')) + self.assertTrue (not vi_is_word (' u')) def test_pos_word_short (self): self.assertEqual (0, vi_pos_word_short ('')) @@ -777,7 +777,7 @@ class Tests (unittest.TestCase): r.input ('"0w"') r.input ('"i"') r.input ('"zz"') - self.assert_ (r.vi_is_insert_mode) + self.assertTrue (r.vi_is_insert_mode) self.assertEqual (r.line, 'abc zzdef ghi') r.input ('Escape') r.input ('"w"') @@ -792,7 +792,7 @@ class Tests (unittest.TestCase): r.input ('"0w"') r.input ('"I"') r.input ('"zz"') - self.assert_ (r.vi_is_insert_mode) + self.assertTrue (r.vi_is_insert_mode) self.assertEqual (r.line, 'zzabc def ghi') r.input ('Escape') r.input ('"w"') @@ -808,7 +808,7 @@ class Tests (unittest.TestCase): r.input ('"a"') r.input ('"zz"') self.assertEqual (r.line, 'azzbc def ghi') - self.assert_ (r.vi_is_insert_mode) + self.assertTrue (r.vi_is_insert_mode) r.input ('Escape') r.input ('"w"') r.input ('"2ayy"') @@ -823,7 +823,7 @@ class Tests (unittest.TestCase): r.input ('"jj"') r.input ('Escape') self.assertEqual (r.line, 'jjjj') - self.assert_ (not r.vi_is_insert_mode) + self.assertTrue (not r.vi_is_insert_mode) def test_append_upper_a (self): r = ViModeTest () @@ -833,7 +833,7 @@ class Tests (unittest.TestCase): r.input ('"A"') r.input ('"zz"') self.assertEqual (r.line, 'abc def ghizz') - self.assert_ (r.vi_is_insert_mode) + self.assertTrue (r.vi_is_insert_mode) r.input ('Escape') r.input ('"0w"') r.input ('"2Ayy"') @@ -916,11 +916,11 @@ class Tests (unittest.TestCase): r.input ('Escape') r.input ('"0w"') r.input ('"C"') - self.assert_ (r.vi_is_insert_mode) + self.assertTrue (r.vi_is_insert_mode) r.input ('"123"') self.assertEqual (r.line, 'abc 123') r.input ('Escape') - self.assert_ (not r.vi_is_insert_mode) + self.assertTrue (not r.vi_is_insert_mode) def test_change_whole_line (self): r = ViModeTest () @@ -928,23 +928,23 @@ class Tests (unittest.TestCase): r.input ('Escape') r.input ('"0w"') r.input ('"S"') - self.assert_ (r.vi_is_insert_mode) + self.assertTrue (r.vi_is_insert_mode) self.assertEqual (r.line, '') r.input ('"123"') self.assertEqual (r.line, '123') r.input ('Escape') - self.assert_ (not r.vi_is_insert_mode) + self.assertTrue (not r.vi_is_insert_mode) def test_change_word_short (self): r = ViModeTest () r._set_line ('abc def ghi') r.input ('Escape') r.input ('"0cwzzz"') - self.assert_ (r.vi_is_insert_mode) + self.assertTrue (r.vi_is_insert_mode) self.assertEqual (r.line, 'zzz def ghi') self.assertEqual (r.line_cursor, 3) r.input ('Escape') - self.assert_ (not r.vi_is_insert_mode) + self.assertTrue (not r.vi_is_insert_mode) self.assertEqual (r.line_cursor, 2) r.input ('"w"') self.assertEqual (r.line_cursor, 4) @@ -959,14 +959,14 @@ class Tests (unittest.TestCase): r.input ('Escape') r.input ('"0cWss"') self.assertEqual (r.line, 'ss ghi.jkl mno.pqr') - self.assert_ (r.vi_is_insert_mode) + self.assertTrue (r.vi_is_insert_mode) self.assertEqual (r.line_cursor, 2) r.input ('Escape') - self.assert_ (not r.vi_is_insert_mode) + self.assertTrue (not r.vi_is_insert_mode) self.assertEqual (r.line_cursor, 1) r.input ('"w2."') self.assertEqual (r.line, 'ss ss') - self.assert_ (not r.vi_is_insert_mode) + self.assertTrue (not r.vi_is_insert_mode) self.assertEqual (r.line_cursor, 4) def test_change_end_short (self): @@ -974,11 +974,11 @@ class Tests (unittest.TestCase): r._set_line ('abc def ghi') r.input ('Escape') r.input ('"0cezzz"') - self.assert_ (r.vi_is_insert_mode) + self.assertTrue (r.vi_is_insert_mode) self.assertEqual (r.line, 'zzz def ghi') self.assertEqual (r.line_cursor, 3) r.input ('Escape') - self.assert_ (not r.vi_is_insert_mode) + self.assertTrue (not r.vi_is_insert_mode) self.assertEqual (r.line_cursor, 2) r.input ('"w2."') self.assertEqual (r.line, 'zzz zzz') @@ -988,11 +988,11 @@ class Tests (unittest.TestCase): r._set_line ('abc.def ghi jkl.mno pqr stu.vwx') r.input ('Escape') r.input ('"02cEzz"') - self.assert_ (r.vi_is_insert_mode) + self.assertTrue (r.vi_is_insert_mode) self.assertEqual (r.line, 'zz jkl.mno pqr stu.vwx') self.assertEqual (r.line_cursor, 2) r.input ('Escape') - self.assert_ (not r.vi_is_insert_mode) + self.assertTrue (not r.vi_is_insert_mode) self.assertEqual (r.line_cursor, 1) r.input ('"w2."') self.assertEqual (r.line, 'zz zz stu.vwx') @@ -1003,11 +1003,11 @@ class Tests (unittest.TestCase): r._set_line ('abc def ghi') r.input ('Escape') r.input ('"$cbzz"') - self.assert_ (r.vi_is_insert_mode) + self.assertTrue (r.vi_is_insert_mode) self.assertEqual (r.line, 'abc def zzi') self.assertEqual (r.line_cursor, 10) r.input ('Escape') - self.assert_ (not r.vi_is_insert_mode) + self.assertTrue (not r.vi_is_insert_mode) self.assertEqual (r.line_cursor, 9) r.input ('"b2."') self.assertEqual (r.line, 'zzzzi') @@ -1018,27 +1018,27 @@ class Tests (unittest.TestCase): r._set_line ('abc.def ghi jkl.mno pqr stu.vwx') r.input ('Escape') r.input ('"$2cBzz"') - self.assert_ (r.vi_is_insert_mode) + self.assertTrue (r.vi_is_insert_mode) self.assertEqual (r.line, 'abc.def ghi jkl.mno zzx') self.assertEqual (r.line_cursor, 22) r.input ('Escape') - self.assert_ (not r.vi_is_insert_mode) + self.assertTrue (not r.vi_is_insert_mode) self.assertEqual (r.line_cursor, 21) r.input ('"5."') self.assertEqual (r.line, 'zzzx') self.assertEqual (r.line_cursor, 2) - self.assert_ (not r.vi_is_insert_mode) + self.assertTrue (not r.vi_is_insert_mode) def test_change_find_lower (self): r = ViModeTest () r._set_line ('aa bb cc dd ee aa bb cc dd ee') r.input ('Escape') r.input ('"0cfbzz"') - self.assert_ (r.vi_is_insert_mode) + self.assertTrue (r.vi_is_insert_mode) self.assertEqual (r.line, 'zzb cc dd ee aa bb cc dd ee') self.assertEqual (r.line_cursor, 2) r.input ('Escape') - self.assert_ (not r.vi_is_insert_mode) + self.assertTrue (not r.vi_is_insert_mode) self.assertEqual (r.line_cursor, 1) r.input ('"c2fcyy"') self.assertEqual (r.line, 'zyy dd ee aa bb cc dd ee') @@ -1051,11 +1051,11 @@ class Tests (unittest.TestCase): r._set_line ('aa bb cc aa bb cc') r.input ('Escape') r.input ('"$2c2Fazz"') - self.assert_ (r.vi_is_insert_mode) + self.assertTrue (r.vi_is_insert_mode) self.assertEqual (r.line, 'zzc') self.assertEqual (r.line_cursor, 2) r.input ('Escape') - self.assert_ (not r.vi_is_insert_mode) + self.assertTrue (not r.vi_is_insert_mode) self.assertEqual (r.line_cursor, 1) r.input ('"."') self.assertEqual (r.line, 'zzc') @@ -1065,14 +1065,14 @@ class Tests (unittest.TestCase): r._set_line ('aa bb cc aa bb cc aa bb cc') r.input ('Escape') r.input ('"02c2ta"') - self.assert_ (r.vi_is_insert_mode) + self.assertTrue (r.vi_is_insert_mode) self.assertEqual (r.line, 'aa bb cc') self.assertEqual (r.line_cursor, 0) r.input ('"zz "') self.assertEqual (r.line, 'zz aa bb cc') self.assertEqual (r.line_cursor, 3) r.input ('Escape') - self.assert_ (not r.vi_is_insert_mode) + self.assertTrue (not r.vi_is_insert_mode) self.assertEqual (r.line_cursor, 2) def test_change_to_upper (self): @@ -1080,20 +1080,20 @@ class Tests (unittest.TestCase): r._set_line ('aa bb cc aa bb cc aa bb cc') r.input ('Escape') r.input ('"$2c2Ta"') - self.assert_ (r.vi_is_insert_mode) + self.assertTrue (r.vi_is_insert_mode) self.assertEqual (r.line, 'aa bb cc ac') self.assertEqual (r.line_cursor, 10) r.input ('"zz"') self.assertEqual (r.line, 'aa bb cc azzc') self.assertEqual (r.line_cursor, 12) r.input ('Escape') - self.assert_ (not r.vi_is_insert_mode) + self.assertTrue (not r.vi_is_insert_mode) self.assertEqual (r.line_cursor, 11) r.input ('"3."') self.assertEqual (r.line, 'azzzc') # The following fails but it does not seem that important # self.assertEqual (r.line_cursor, 2) - self.assert_ (not r.vi_is_insert_mode) + self.assertTrue (not r.vi_is_insert_mode) def test_pos_matching (self): self.assertEqual (6, vi_pos_matching ('aa (bb)')) @@ -1146,9 +1146,9 @@ class Tests (unittest.TestCase): r._set_line ('abc def') r.input ('Escape') r.input ('"0"') - self.assert_ (not r.vi_is_insert_mode) + self.assertTrue (not r.vi_is_insert_mode) r.input ('"yw"') - self.assert_ (not r.vi_is_insert_mode) + self.assertTrue (not r.vi_is_insert_mode) self.assertEqual (r.line, 'abc def') self.assertEqual (r.line_cursor, 0) r.input ('"P"') @@ -1164,7 +1164,7 @@ class Tests (unittest.TestCase): r.input ('Escape') r.input ('"0"') r.input ('"y3l"') - self.assert_ (not r.vi_is_insert_mode) + self.assertTrue (not r.vi_is_insert_mode) self.assertEqual (r.line_cursor, 0) r.input ('"2P"') self.assertEqual (r.line, '001001001122') @@ -1552,34 +1552,34 @@ class Tests (unittest.TestCase): r.add_history ('ccc') r.input ('Up') self.assertEqual (r.line, 'ccc') - self.assert_ (r.vi_is_insert_mode) + self.assertTrue (r.vi_is_insert_mode) r.input ('"z"') self.assertEqual (r.line, 'cccz') r.input ('Escape') - self.assert_ (not r.vi_is_insert_mode) + self.assertTrue (not r.vi_is_insert_mode) r.input ('Up') self.assertEqual (r.line, 'bbb') - self.assert_ (r.vi_is_insert_mode) + self.assertTrue (r.vi_is_insert_mode) r.input ('"z"') self.assertEqual (r.line, 'bbbz') r.input ('Escape') r.input ('"k"') self.assertEqual (r.line, 'aaa') - self.assert_ (not r.vi_is_insert_mode) + self.assertTrue (not r.vi_is_insert_mode) r.input ('"iz"') self.assertEqual (r.line, 'zaaa') r.input ('Down') self.assertEqual (r.line, 'bbb') - self.assert_ (r.vi_is_insert_mode) + self.assertTrue (r.vi_is_insert_mode) r.input ('"y"') self.assertEqual (r.line, 'bbby') r.input ('Escape') r.input ('"j"') self.assertEqual (r.line, 'ccc') - self.assert_ (not r.vi_is_insert_mode) + self.assertTrue (not r.vi_is_insert_mode) r.input ('"iy"') self.assertEqual (r.line, 'yccc') - self.assert_ (r.vi_is_insert_mode) + self.assertTrue (r.vi_is_insert_mode) def test_history_cursor_arrow (self): r = ViModeTest () @@ -1613,48 +1613,48 @@ class Tests (unittest.TestCase): r.input ('Control-p') self.assertEqual (r.line, 'bbb') self.assertEqual (r.line_cursor, 3) - self.assert_ (r.vi_is_insert_mode) + self.assertTrue (r.vi_is_insert_mode) r.input ('Control-p') self.assertEqual (r.line, 'aa') self.assertEqual (r.line_cursor, 2) - self.assert_ (r.vi_is_insert_mode) + self.assertTrue (r.vi_is_insert_mode) r.input ('Control-n') self.assertEqual (r.line, 'bbb') self.assertEqual (r.line_cursor, 3) - self.assert_ (r.vi_is_insert_mode) + self.assertTrue (r.vi_is_insert_mode) r.input ('Control-n') self.assertEqual (r.line, '') self.assertEqual (r.line_cursor, 0) - self.assert_ (r.vi_is_insert_mode) + self.assertTrue (r.vi_is_insert_mode) r.input ('Control-p') self.assertEqual (r.line, 'bbb') self.assertEqual (r.line_cursor, 3) - self.assert_ (r.vi_is_insert_mode) + self.assertTrue (r.vi_is_insert_mode) r.input ('Escape') self.assertEqual (r.line, 'bbb') self.assertEqual (r.line_cursor, 2) - self.assert_ (not r.vi_is_insert_mode) + self.assertTrue (not r.vi_is_insert_mode) r.input ('Control-p') self.assertEqual (r.line, 'aa') self.assertEqual (r.line_cursor, 0) - self.assert_ (not r.vi_is_insert_mode) + self.assertTrue (not r.vi_is_insert_mode) r.input ('Control-n') self.assertEqual (r.line, 'bbb') self.assertEqual (r.line_cursor, 0) - self.assert_ (not r.vi_is_insert_mode) + self.assertTrue (not r.vi_is_insert_mode) r.input ('Control-n') self.assertEqual (r.line, '') self.assertEqual (r.line_cursor, 0) - self.assert_ (not r.vi_is_insert_mode) + self.assertTrue (not r.vi_is_insert_mode) r.input ('"/a"') r.input ('Return') self.assertEqual (r.line, 'aa') self.assertEqual (r.line_cursor, 0) - self.assert_ (not r.vi_is_insert_mode) + self.assertTrue (not r.vi_is_insert_mode) r.input ('Control-n') self.assertEqual (r.line, 'bbb') self.assertEqual (r.line_cursor, 0) - self.assert_ (not r.vi_is_insert_mode) + self.assertTrue (not r.vi_is_insert_mode) def test_history_cursor_j_and_k (self): r = ViModeTest () @@ -1771,9 +1771,9 @@ class Tests (unittest.TestCase): def test_editor (self): vee = ViExternalEditorTest ('qwerty before') - self.assert_ (vee.sio_write.closed) + self.assertTrue (vee.sio_write.closed) self.assertEqual (vee.command, 'vim.exe temp.py') - self.assert_ (vee.sio_read.closed) + self.assertTrue (vee.sio_read.closed) self.assertEqual (vee.remove, 'temp.py') self.assertEqual (vee.result, 'qwerty after') @@ -1790,11 +1790,11 @@ class Tests (unittest.TestCase): r.lst_completions = ['bbc', 'bbd', 'bbe', ] r.input ('"aa bb"') r.input ('Escape') - self.assert_ (not r.vi_is_insert_mode) + self.assertTrue (not r.vi_is_insert_mode) r.input ('"*"') self.assertEqual (r.line, 'aa bbc bbd bbe ') self.assertEqual (r.line_cursor, 15) - self.assert_ (r.vi_is_insert_mode) + self.assertTrue (r.vi_is_insert_mode) self.assertEqual (r.console.text, '') r.input ('" "') r.input ('Escape') @@ -1834,28 +1834,28 @@ class Tests (unittest.TestCase): r.input ('"0ry"') self.assertEqual (r.line, 'yaa bbb ccc') self.assertEqual (r.line_cursor, 0) - self.assert_ (not r.vi_is_insert_mode) + self.assertTrue (not r.vi_is_insert_mode) r.input ('"i"') self.assertEqual (r.line, 'yaa bbb ccc') self.assertEqual (r.line_cursor, 0) - self.assert_ (r.vi_is_insert_mode) + self.assertTrue (r.vi_is_insert_mode) r.input ('"x"') self.assertEqual (r.line, 'xyaa bbb ccc') self.assertEqual (r.line_cursor, 1) - self.assert_ (r.vi_is_insert_mode) + self.assertTrue (r.vi_is_insert_mode) r.input ('Escape') self.assertEqual (r.line, 'xyaa bbb ccc') self.assertEqual (r.line_cursor, 0) - self.assert_ (not r.vi_is_insert_mode) + self.assertTrue (not r.vi_is_insert_mode) r.input ('"ll"') r.input ('"2rz"') self.assertEqual (r.line, 'xyzz bbb ccc') self.assertEqual (r.line_cursor, 3) - self.assert_ (not r.vi_is_insert_mode) + self.assertTrue (not r.vi_is_insert_mode) r.input ('"w7."') self.assertEqual (r.line, 'xyzz zzzzzzz') self.assertEqual (r.line_cursor, 11) - self.assert_ (not r.vi_is_insert_mode) + self.assertTrue (not r.vi_is_insert_mode) def test_replace_lower_undo (self): r = ViModeTest () @@ -1908,11 +1908,11 @@ class Tests (unittest.TestCase): r.input ('"0rzl"') self.assertEqual (r.line, 'zb') self.assertEqual (r.line_cursor, 1) - self.assert_ (not r.vi_is_insert_mode) + self.assertTrue (not r.vi_is_insert_mode) r.input ('"r."') self.assertEqual (r.line, 'z.') self.assertEqual (r.line_cursor, 1) - self.assert_ (not r.vi_is_insert_mode) + self.assertTrue (not r.vi_is_insert_mode) def test_replace_upper (self): r = ViModeTest () @@ -1921,18 +1921,18 @@ class Tests (unittest.TestCase): r.input ('"0wR"') self.assertEqual (r.line, 'aaa bbb') self.assertEqual (r.line_cursor, 4) - self.assert_ (r.vi_is_insert_mode) + self.assertTrue (r.vi_is_insert_mode) r.input ('"z"') self.assertEqual (r.line, 'aaa zbb') self.assertEqual (r.line_cursor, 5) - self.assert_ (r.vi_is_insert_mode) + self.assertTrue (r.vi_is_insert_mode) r.input ('"zzz"') self.assertEqual (r.line, 'aaa zzzz') self.assertEqual (r.line_cursor, 8) - self.assert_ (r.vi_is_insert_mode) + self.assertTrue (r.vi_is_insert_mode) r.input ('Escape') self.assertEqual (r.line_cursor, 7) - self.assert_ (not r.vi_is_insert_mode) + self.assertTrue (not r.vi_is_insert_mode) def test_replace_upper_dot (self): r = ViModeTest () @@ -1942,15 +1942,15 @@ class Tests (unittest.TestCase): r.input ('Escape') self.assertEqual (r.line, 'zza bbb ccc ddd') self.assertEqual (r.line_cursor, 1) - self.assert_ (not r.vi_is_insert_mode) + self.assertTrue (not r.vi_is_insert_mode) r.input ('"w."') self.assertEqual (r.line, 'zza zzb ccc ddd') self.assertEqual (r.line_cursor, 5) - self.assert_ (not r.vi_is_insert_mode) + self.assertTrue (not r.vi_is_insert_mode) r.input ('"w6."') self.assertEqual (r.line, 'zza zzb zzzzzzd') self.assertEqual (r.line_cursor, 13) - self.assert_ (not r.vi_is_insert_mode) + self.assertTrue (not r.vi_is_insert_mode) def test_replace_upper_undo (self): r = ViModeTest () @@ -1973,7 +1973,7 @@ class Tests (unittest.TestCase): r.input ('"0wRc"') self.assertEqual (r.line, 'aa cb') self.assertEqual (r.line_cursor, 4) - self.assert_ (r.vi_is_insert_mode) + self.assertTrue (r.vi_is_insert_mode) r.input ('"c"') self.assertEqual (r.line, 'aa cc') self.assertEqual (r.line_cursor, 5) @@ -1983,35 +1983,35 @@ class Tests (unittest.TestCase): r.input ('BackSpace') self.assertEqual (r.line, 'aa cc') self.assertEqual (r.line_cursor, 5) - self.assert_ (r.vi_is_insert_mode) + self.assertTrue (r.vi_is_insert_mode) r.input ('BackSpace') self.assertEqual (r.line, 'aa cb') self.assertEqual (r.line_cursor, 4) - self.assert_ (r.vi_is_insert_mode) + self.assertTrue (r.vi_is_insert_mode) r.input ('BackSpace') self.assertEqual (r.line, 'aa bb') self.assertEqual (r.line_cursor, 3) - self.assert_ (r.vi_is_insert_mode) + self.assertTrue (r.vi_is_insert_mode) r.input ('BackSpace') self.assertEqual (r.line, 'aa bb') self.assertEqual (r.line_cursor, 2) - self.assert_ (r.vi_is_insert_mode) + self.assertTrue (r.vi_is_insert_mode) r.input ('"d"') self.assertEqual (r.line, 'aadbb') self.assertEqual (r.line_cursor, 3) - self.assert_ (r.vi_is_insert_mode) + self.assertTrue (r.vi_is_insert_mode) r.input ('Escape') self.assertEqual (r.line, 'aadbb') self.assertEqual (r.line_cursor, 2) - self.assert_ (not r.vi_is_insert_mode) + self.assertTrue (not r.vi_is_insert_mode) r.input ('"u"') self.assertEqual (r.line, 'aa bb') self.assertEqual (r.line_cursor, 3) - self.assert_ (not r.vi_is_insert_mode) + self.assertTrue (not r.vi_is_insert_mode) r.input ('"hh"') r.input ('"."') self.assertEqual (r.line, 'da bb') - self.assert_ (not r.vi_is_insert_mode) + self.assertTrue (not r.vi_is_insert_mode) def test_yank_line (self): r = ViModeTest () @@ -2019,13 +2019,13 @@ class Tests (unittest.TestCase): r.input ('Escape') r.input ('"0wY"') self.assertEqual (r.line, 'aa bb') - self.assert_ (not r.vi_is_insert_mode) + self.assertTrue (not r.vi_is_insert_mode) r.input ('"P"') self.assertEqual (r.line, 'aa aa bbbb') - self.assert_ (not r.vi_is_insert_mode) + self.assertTrue (not r.vi_is_insert_mode) r.input ('"u"') self.assertEqual (r.line, 'aa bb') - self.assert_ (not r.vi_is_insert_mode) + self.assertTrue (not r.vi_is_insert_mode) def test_column (self): r = ViModeTest () @@ -2054,19 +2054,19 @@ class Tests (unittest.TestCase): r.input ('"0~"') self.assertEqual (r.line, 'Aaa B7B ccc') self.assertEqual (r.line_cursor, 1) - self.assert_ (not r.vi_is_insert_mode) + self.assertTrue (not r.vi_is_insert_mode) r.input ('"h."') self.assertEqual (r.line, 'aaa B7B ccc') self.assertEqual (r.line_cursor, 1) - self.assert_ (not r.vi_is_insert_mode) + self.assertTrue (not r.vi_is_insert_mode) r.input ('"9~"') self.assertEqual (r.line, 'aAA b7b CCc') self.assertEqual (r.line_cursor, 10) - self.assert_ (not r.vi_is_insert_mode) + self.assertTrue (not r.vi_is_insert_mode) r.input ('"u"') self.assertEqual (r.line, 'aaa B7B ccc') self.assertEqual (r.line_cursor, 1) - self.assert_ (not r.vi_is_insert_mode) + self.assertTrue (not r.vi_is_insert_mode) def test_redo (self): r = ViModeTest ()