diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py index 227e708..4f4e5f6 100644 --- a/IPython/core/interactiveshell.py +++ b/IPython/core/interactiveshell.py @@ -181,6 +181,15 @@ class ReadlineNoRecord(object): return [ghi(x) for x in range(start, end)] +_autocall_help = """ +Make IPython automatically call any callable object even if +you didn't type explicit parentheses. For example, 'str 43' becomes 'str(43)' +automatically. The value can be '0' to disable the feature, '1' for 'smart' +autocall, where it is not applied if there are no more arguments on the line, +and '2' for 'full' autocall, where all callable objects are automatically +called (even if no arguments are present). The default is '1'. +""" + #----------------------------------------------------------------------------- # Main IPython class #----------------------------------------------------------------------------- @@ -189,20 +198,30 @@ class InteractiveShell(Configurable, Magic): """An enhanced, interactive shell for Python.""" _instance = None - autocall = Enum((0,1,2), default_value=1, config=True, - help= - """Make IPython automatically call any callable object even if you - didn't type explicit parentheses. For example, 'str 43' becomes - 'str(43)' automatically. The value can be '0' to disable the feature, - '1' for 'smart' autocall, where it is not applied if there are no more + + autocall = Enum((0,1,2), default_value=1, config=True, help= + """ + Make IPython automatically call any callable object even if you didn't + type explicit parentheses. For example, 'str 43' becomes 'str(43)' + automatically. The value can be '0' to disable the feature, '1' for + 'smart' autocall, where it is not applied if there are no more arguments on the line, and '2' for 'full' autocall, where all callable objects are automatically called (even if no arguments are present). - The default is '1'.""" + The default is '1'. + """ ) # TODO: remove all autoindent logic and put into frontends. # We can't do this yet because even runlines uses the autoindent. - autoindent = CBool(True, config=True) - automagic = CBool(True, config=True) + autoindent = CBool(True, config=True, help= + """ + Should IPython indent code entered interactively. + """ + ) + automagic = CBool(True, config=True, help= + """ + Enable magic commands to be called without the leading %. + """ + ) cache_size = Int(1000, config=True) color_info = CBool(True, config=True) colors = CaselessStrEnum(('NoColor','LightBG','Linux'),