diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py index 26bf430..cd00bb4 100644 --- a/IPython/core/interactiveshell.py +++ b/IPython/core/interactiveshell.py @@ -32,6 +32,7 @@ from contextlib import nested from IPython.config.configurable import Configurable from IPython.core import debugger, oinspect from IPython.core import history as ipcorehist +from IPython.core import page from IPython.core import prefilter from IPython.core import shadowns from IPython.core import ultratb @@ -2115,6 +2116,10 @@ class InteractiveShell(Configurable, Magic): if self.quiet: return True return ask_yes_no(prompt,default) + + def show_usage(self): + """Show a usage message""" + page.page(IPython.core.usage.interactive_usage) #------------------------------------------------------------------------- # Things related to IPython exiting diff --git a/IPython/core/prefilter.py b/IPython/core/prefilter.py index 45ac5ad..d2e86ac 100755 --- a/IPython/core/prefilter.py +++ b/IPython/core/prefilter.py @@ -960,7 +960,7 @@ class HelpHandler(PrefilterHandler): #print 'line:<%r>' % line # dbg self.shell.magic_pinfo(line) else: - page.page(self.shell.usage, screen_lines=self.shell.usable_screen_length) + self.shell.show_usage() return '' # Empty string is needed here! except: raise