From c87e0b429c52b0e19acd0e6e5efb89a28c85cc75 Mon Sep 17 00:00:00 2001
From: Jorgen Stenarson <jorgen.stenarson@bostream.nu>
Date: Tue, 20 Jul 2010 19:12:13 +0200
Subject: [PATCH] Fix failure in unit test of vi mode

---
 build-doc.bat              | 2 +-
 pyreadline/modes/vi.py     | 1 +
 pyreadline/test/common.py  | 4 ++++
 pyreadline/test/test_vi.py | 6 +++---
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/build-doc.bat b/build-doc.bat
index 1bcb636..28ea964 100644
--- a/build-doc.bat
+++ b/build-doc.bat
@@ -1,4 +1,4 @@
-SET VERSION=1.6
+SET VERSION=1.7
 python setup.py build_sphinx
 python setup.py build_sphinx -b latex
 
diff --git a/pyreadline/modes/vi.py b/pyreadline/modes/vi.py
index 9481c07..b228727 100644
--- a/pyreadline/modes/vi.py
+++ b/pyreadline/modes/vi.py
@@ -327,6 +327,7 @@ class ViCommand:
         self.readline._vi_multiplier2 = ''
         self.set_override_multiplier (0)
         self.skip_multipler = False
+        self.tabstop = 4
         self.dct_fcn = {
             ord('$') : self.key_dollar,
             ord('^') : self.key_hat,
diff --git a/pyreadline/test/common.py b/pyreadline/test/common.py
index 783743d..cc24dd4 100644
--- a/pyreadline/test/common.py
+++ b/pyreadline/test/common.py
@@ -56,6 +56,10 @@ class Event:
             self.char=u'\x1b'
         elif char==u"backspace":
             self.char=u'\x08'
+        elif char==u"tab":
+            self.char=u'\t'
+        elif char==u"space":
+            self.char=u' '
         else:
             self.char = char
 
diff --git a/pyreadline/test/test_vi.py b/pyreadline/test/test_vi.py
index 0728193..8b5c904 100644
--- a/pyreadline/test/test_vi.py
+++ b/pyreadline/test/test_vi.py
@@ -27,7 +27,7 @@ class ViModeTest (ViMode):
         self.vi_set_insert_mode (True)
         self.lst_completions = []
         self.completer = self.mock_completer
-        self.completer_delims = u' u'
+        self.completer_delims = u' '
         self.tabstop = 4
 
     def get_mock_console (self):
@@ -52,8 +52,8 @@ class ViModeTest (ViMode):
             lst_key = [keytext]
         for key in lst_key:
             keyinfo, event = keytext_to_keyinfo_and_event (key)
-            dispatch_func = self.key_dispatch.get( keyinfo.tuple(),self.vi_key)
-            self.tested_commands[dispatch_func.__name__]=dispatch_func
+            dispatch_func = self.key_dispatch.get(keyinfo.tuple(), self.vi_key)
+            self.tested_commands[dispatch_func.__name__] = dispatch_func
             dispatch_func (event)
 
     def vi_accept_line (self, e):