Merge pull request #3 from python-cmd2/fix_bugs

Fixed bug do to change in how help works in cmd2

Author: tleonhardt

cmd2_submenu/submenu.py

@@ -183,7 +183,7 @@ def complete_submenu(_self, text, line, begidx, endidx):
                 _self.display_matches = copy.copy(submenu.display_matches)
 
         original_do_help = cmd_obj.do_help
-        original_complete_help = cmd_obj.complete_help
+        original_complete_help_command = cmd_obj.complete_help_command
 
         def help_submenu(_self, line):
             """
@@ -209,7 +209,7 @@ def _complete_submenu_help(_self, text, line, begidx, endidx):
                     endidx - line.index(tokens[1]),
                 )
             else:
-                return original_complete_help(_self, text, line, begidx, endidx)
+                return original_complete_help_command(_self, text, line, begidx, endidx)
 
         if self.create_subclass:
             class _Cmd(cmd_obj):

setup.py

@@ -25,7 +25,7 @@
     packages=['cmd2_submenu'],
 
     python_requires='>=3.4',
-    install_requires=['cmd2 >= 0.9.4, <=2'],
+    install_requires=['cmd2 >= 0.9.6, <=2'],
     setup_requires=['setuptools_scm'],
 
     classifiers=[

tests/conftest.py

@@ -1,20 +1,5 @@
 #
 # coding=utf-8
-
-class StdOut(object):
-    """ Toy class for replacing self.stdout in cmd2.Cmd instances for unit testing. """
-    def __init__(self):
-        self.buffer = ''
-
-    def write(self, s):
-        self.buffer += s
-
-    def read(self):
-        raise NotImplementedError
-
-    def clear(self):
-        self.buffer = ''
-
 def normalize(block):
     """ Normalize a block of text to perform comparison.
 
@@ -27,9 +12,9 @@ def normalize(block):
 
 
 def run_cmd(app, cmd):
-    """ Clear StdOut buffer, run the command, extract the buffer contents, """
+    """ Clear StdSim buffer, run the command, extract the buffer contents, """
     app.stdout.clear()
     app.onecmd_plus_hooks(cmd)
-    out = app.stdout.buffer
+    out = app.stdout.getvalue()
     app.stdout.clear()
     return normalize(out)

tests/test_submenu.py

@@ -10,8 +10,8 @@
 
 from cmd2 import cmd2
 import cmd2_submenu
-from conftest import run_cmd, StdOut, normalize
-
+from conftest import run_cmd, normalize
+from cmd2.utils import StdSim
 
 class SecondLevelB(cmd2.Cmd):
     """To be used as a second level command class. """
@@ -88,32 +88,32 @@ def complete_say(self, text, line, begidx, endidx):
 @pytest.fixture
 def submenu_app():
     app = SubmenuApp()
-    app.stdout = StdOut()
-    second_level_cmd.stdout = StdOut()
-    second_level_b_cmd.stdout = StdOut()
+    app.stdout = StdSim(app.stdout)
+    second_level_cmd.stdout = StdSim(app.stdout)
+    second_level_b_cmd.stdout = StdSim(app.stdout)
     return app
 
 
 @pytest.fixture
 def secondlevel_app():
     app = SecondLevel()
-    app.stdout = StdOut()
+    app.stdout = StdSim(app.stdout)
     return app
 
 
 @pytest.fixture
 def secondlevel_app_b():
     app = SecondLevelB()
-    app.stdout = StdOut()
+    app.stdout = StdSim(app.stdout)
     return app
 
 def run_submenu_cmd(app, second_level_app, cmd):
-    """ Clear StdOut buffers, run the command, extract the buffer contents."""
+    """ Clear StdSim buffers, run the command, extract the buffer contents."""
     app.stdout.clear()
     second_level_app.stdout.clear()
     app.onecmd_plus_hooks(cmd)
-    out1 = app.stdout.buffer
-    out2 = second_level_app.stdout.buffer
+    out1 = app.stdout.getvalue()
+    out2 = second_level_app.stdout.getvalue()
     app.stdout.clear()
     second_level_app.stdout.clear()
     return normalize(out1), normalize(out2)