##// END OF EJS Templates
Merge pull request #9573 from Carreau/9551...
Min RK -
r22517:11654150 merge
parent child Browse files
Show More
@@ -95,6 +95,13 b' try:'
95 except ImportError:
95 except ImportError:
96 sphinxify = None
96 sphinxify = None
97
97
98
99 class ProvisionalWarning(DeprecationWarning):
100 """
101 Warning class for unstable features
102 """
103 pass
104
98 #-----------------------------------------------------------------------------
105 #-----------------------------------------------------------------------------
99 # Globals
106 # Globals
100 #-----------------------------------------------------------------------------
107 #-----------------------------------------------------------------------------
@@ -212,6 +219,7 b' class InteractiveShell(SingletonConfigurable):'
212 Autoindent IPython code entered interactively.
219 Autoindent IPython code entered interactively.
213 """
220 """
214 ).tag(config=True)
221 ).tag(config=True)
222
215 automagic = Bool(True, help=
223 automagic = Bool(True, help=
216 """
224 """
217 Enable magic commands to be called without the leading %.
225 Enable magic commands to be called without the leading %.
@@ -277,16 +285,29 b' class InteractiveShell(SingletonConfigurable):'
277 display_formatter = Instance(DisplayFormatter, allow_none=True)
285 display_formatter = Instance(DisplayFormatter, allow_none=True)
278 displayhook_class = Type(DisplayHook)
286 displayhook_class = Type(DisplayHook)
279 display_pub_class = Type(DisplayPublisher)
287 display_pub_class = Type(DisplayPublisher)
288
280 sphinxify_docstring = Bool(False, help=
289 sphinxify_docstring = Bool(False, help=
281 """
290 """
282 Enables rich html representation of docstrings. (This requires the
291 Enables rich html representation of docstrings. (This requires the
283 docrepr module).
292 docrepr module).
284 """).tag(config=True)
293 """).tag(config=True)
294
295 @observe("sphinxify_docstring")
296 def _sphinxify_docstring_changed(self, change):
297 if change['new']:
298 warn("`sphinxify_docstring` is provisional since IPython 5.0 and might change in future versions." , ProvisionalWarning)
299
285 enable_html_pager = Bool(False, help=
300 enable_html_pager = Bool(False, help=
286 """
301 """
287 (Provisional API) enables html representation in mime bundles sent
302 (Provisional API) enables html representation in mime bundles sent
288 to pagers.
303 to pagers.
289 """).tag(config=True)
304 """).tag(config=True)
305
306 @observe("enable_html_pager")
307 def _enable_html_pager_changed(self, change):
308 if change['new']:
309 warn("`enable_html_pager` is provisional since IPython 5.0 and might change in future versions.", ProvisionalWarning)
310
290 data_pub_class = None
311 data_pub_class = None
291
312
292 exit_now = Bool(False)
313 exit_now = Bool(False)
General Comments 0
You need to be logged in to leave comments. Login now