Show More
@@ -181,6 +181,15 b' class ReadlineNoRecord(object):' | |||||
181 | return [ghi(x) for x in range(start, end)] |
|
181 | return [ghi(x) for x in range(start, end)] | |
182 |
|
182 | |||
183 |
|
183 | |||
|
184 | _autocall_help = """ | |||
|
185 | Make IPython automatically call any callable object even if | |||
|
186 | you didn't type explicit parentheses. For example, 'str 43' becomes 'str(43)' | |||
|
187 | automatically. The value can be '0' to disable the feature, '1' for 'smart' | |||
|
188 | autocall, where it is not applied if there are no more arguments on the line, | |||
|
189 | and '2' for 'full' autocall, where all callable objects are automatically | |||
|
190 | called (even if no arguments are present). The default is '1'. | |||
|
191 | """ | |||
|
192 | ||||
184 | #----------------------------------------------------------------------------- |
|
193 | #----------------------------------------------------------------------------- | |
185 | # Main IPython class |
|
194 | # Main IPython class | |
186 | #----------------------------------------------------------------------------- |
|
195 | #----------------------------------------------------------------------------- | |
@@ -189,20 +198,30 b' class InteractiveShell(Configurable, Magic):' | |||||
189 | """An enhanced, interactive shell for Python.""" |
|
198 | """An enhanced, interactive shell for Python.""" | |
190 |
|
199 | |||
191 | _instance = None |
|
200 | _instance = None | |
192 | autocall = Enum((0,1,2), default_value=1, config=True, |
|
201 | ||
193 | help= |
|
202 | autocall = Enum((0,1,2), default_value=1, config=True, help= | |
194 | """Make IPython automatically call any callable object even if you |
|
203 | """ | |
195 | didn't type explicit parentheses. For example, 'str 43' becomes |
|
204 | Make IPython automatically call any callable object even if you didn't | |
196 | 'str(43)' automatically. The value can be '0' to disable the feature, |
|
205 | type explicit parentheses. For example, 'str 43' becomes 'str(43)' | |
197 | '1' for 'smart' autocall, where it is not applied if there are no more |
|
206 | automatically. The value can be '0' to disable the feature, '1' for | |
|
207 | 'smart' autocall, where it is not applied if there are no more | |||
198 | arguments on the line, and '2' for 'full' autocall, where all callable |
|
208 | arguments on the line, and '2' for 'full' autocall, where all callable | |
199 | objects are automatically called (even if no arguments are present). |
|
209 | objects are automatically called (even if no arguments are present). | |
200 |
The default is '1'. |
|
210 | The default is '1'. | |
|
211 | """ | |||
201 | ) |
|
212 | ) | |
202 | # TODO: remove all autoindent logic and put into frontends. |
|
213 | # TODO: remove all autoindent logic and put into frontends. | |
203 | # We can't do this yet because even runlines uses the autoindent. |
|
214 | # We can't do this yet because even runlines uses the autoindent. | |
204 |
autoindent = CBool(True, config=True |
|
215 | autoindent = CBool(True, config=True, help= | |
205 | automagic = CBool(True, config=True) |
|
216 | """ | |
|
217 | Should IPython indent code entered interactively. | |||
|
218 | """ | |||
|
219 | ) | |||
|
220 | automagic = CBool(True, config=True, help= | |||
|
221 | """ | |||
|
222 | Enable magic commands to be called without the leading %. | |||
|
223 | """ | |||
|
224 | ) | |||
206 | cache_size = Int(1000, config=True) |
|
225 | cache_size = Int(1000, config=True) | |
207 | color_info = CBool(True, config=True) |
|
226 | color_info = CBool(True, config=True) | |
208 | colors = CaselessStrEnum(('NoColor','LightBG','Linux'), |
|
227 | colors = CaselessStrEnum(('NoColor','LightBG','Linux'), |
General Comments 0
You need to be logged in to leave comments.
Login now