##// END OF EJS Templates
Get naked '?' to work, and in-spec with the new inputsplitter design.
Fernando Perez -
Show More
@@ -32,6 +32,7 b' from contextlib import nested'
32 from IPython.config.configurable import Configurable
32 from IPython.config.configurable import Configurable
33 from IPython.core import debugger, oinspect
33 from IPython.core import debugger, oinspect
34 from IPython.core import history as ipcorehist
34 from IPython.core import history as ipcorehist
35 from IPython.core import page
35 from IPython.core import prefilter
36 from IPython.core import prefilter
36 from IPython.core import shadowns
37 from IPython.core import shadowns
37 from IPython.core import ultratb
38 from IPython.core import ultratb
@@ -2115,6 +2116,10 b' class InteractiveShell(Configurable, Magic):'
2115 if self.quiet:
2116 if self.quiet:
2116 return True
2117 return True
2117 return ask_yes_no(prompt,default)
2118 return ask_yes_no(prompt,default)
2119
2120 def show_usage(self):
2121 """Show a usage message"""
2122 page.page(IPython.core.usage.interactive_usage)
2118
2123
2119 #-------------------------------------------------------------------------
2124 #-------------------------------------------------------------------------
2120 # Things related to IPython exiting
2125 # Things related to IPython exiting
@@ -960,7 +960,7 b' class HelpHandler(PrefilterHandler):'
960 #print 'line:<%r>' % line # dbg
960 #print 'line:<%r>' % line # dbg
961 self.shell.magic_pinfo(line)
961 self.shell.magic_pinfo(line)
962 else:
962 else:
963 page.page(self.shell.usage, screen_lines=self.shell.usable_screen_length)
963 self.shell.show_usage()
964 return '' # Empty string is needed here!
964 return '' # Empty string is needed here!
965 except:
965 except:
966 raise
966 raise
General Comments 0
You need to be logged in to leave comments. Login now