##// END OF EJS Templates
Merge pull request #13249 from Carreau/misc-docs...
Matthias Bussonnier -
r27147:fa00e866 merge
parent child Browse files
Show More
@@ -177,7 +177,13 b' else:'
177 # may have trouble processing.
177 # may have trouble processing.
178 MATCHES_LIMIT = 500
178 MATCHES_LIMIT = 500
179
179
180 _deprecation_readline_sentinel = object()
180
181 class Sentinel:
182 def __repr__(self):
183 return "<deprecated sentinel>"
184
185
186 _deprecation_readline_sentinel = Sentinel()
181
187
182
188
183 class ProvisionalCompleterWarning(FutureWarning):
189 class ProvisionalCompleterWarning(FutureWarning):
@@ -2894,7 +2894,7 b' class InteractiveShell(SingletonConfigurable):'
2894 result: bool
2894 result: bool
2895 Whether the code needs to be run with a coroutine runner or not
2895 Whether the code needs to be run with a coroutine runner or not
2896
2896
2897 .. versionadded: 7.0
2897 .. versionadded:: 7.0
2898 """
2898 """
2899 if not self.autoawait:
2899 if not self.autoawait:
2900 return False
2900 return False
@@ -2959,7 +2959,7 b' class InteractiveShell(SingletonConfigurable):'
2959 -------
2959 -------
2960 result : :class:`ExecutionResult`
2960 result : :class:`ExecutionResult`
2961
2961
2962 .. versionadded: 7.0
2962 .. versionadded:: 7.0
2963 """
2963 """
2964 info = ExecutionInfo(
2964 info = ExecutionInfo(
2965 raw_cell, store_history, silent, shell_futures)
2965 raw_cell, store_history, silent, shell_futures)
@@ -119,7 +119,7 b' def print_figure(fig, fmt="png", bbox_inches="tight", base64=False, **kwargs):'
119 If `base64` is True, return base64-encoded str instead of raw bytes
119 If `base64` is True, return base64-encoded str instead of raw bytes
120 for binary-encoded image formats
120 for binary-encoded image formats
121
121
122 .. versionadded: 7.29
122 .. versionadded:: 7.29
123 base64 argument
123 base64 argument
124 """
124 """
125 # When there's an empty figure, we shouldn't return anything, otherwise we
125 # When there's an empty figure, we shouldn't return anything, otherwise we
@@ -162,7 +162,7 b' def retina_figure(fig, base64=False, **kwargs):'
162 If `base64` is True, return base64-encoded str instead of raw bytes
162 If `base64` is True, return base64-encoded str instead of raw bytes
163 for binary-encoded image formats
163 for binary-encoded image formats
164
164
165 .. versionadded: 7.29
165 .. versionadded:: 7.29
166 base64 argument
166 base64 argument
167 """
167 """
168 pngdata = print_figure(fig, fmt="retina", base64=False, **kwargs)
168 pngdata = print_figure(fig, fmt="retina", base64=False, **kwargs)
@@ -399,7 +399,7 b' def import_pylab(user_ns, import_all=True):'
399
399
400 def configure_inline_support(shell, backend):
400 def configure_inline_support(shell, backend):
401 """
401 """
402 .. deprecated: 7.23
402 .. deprecated:: 7.23
403
403
404 use `matplotlib_inline.backend_inline.configure_inline_support()`
404 use `matplotlib_inline.backend_inline.configure_inline_support()`
405
405
@@ -593,6 +593,9 b' class DollarFormatter(FullEvalFormatter):'
593 # Re-yield the {foo} style pattern
593 # Re-yield the {foo} style pattern
594 yield (txt + literal_txt[continue_from:], field_name, format_spec, conversion)
594 yield (txt + literal_txt[continue_from:], field_name, format_spec, conversion)
595
595
596 def __repr__(self):
597 return "<DollarFormatter>"
598
596 #-----------------------------------------------------------------------------
599 #-----------------------------------------------------------------------------
597 # Utils to columnize a list of string
600 # Utils to columnize a list of string
598 #-----------------------------------------------------------------------------
601 #-----------------------------------------------------------------------------
General Comments 0
You need to be logged in to leave comments. Login now