##// END OF EJS Templates
Merge pull request #13325 from meeseeksmachine/auto-backport-of-pr-13249-on-7.x...
Matthias Bussonnier -
r27149:5b8cff4b merge
parent child Browse files
Show More
@@ -166,7 +166,13 b' else:'
166 166 # may have trouble processing.
167 167 MATCHES_LIMIT = 500
168 168
169 _deprecation_readline_sentinel = object()
169
170 class Sentinel:
171 def __repr__(self):
172 return "<deprecated sentinel>"
173
174
175 _deprecation_readline_sentinel = Sentinel()
170 176
171 177
172 178 class ProvisionalCompleterWarning(FutureWarning):
@@ -2981,7 +2981,7 b' class InteractiveShell(SingletonConfigurable):'
2981 2981 result: bool
2982 2982 Whether the code needs to be run with a coroutine runner or not
2983 2983
2984 .. versionadded: 7.0
2984 .. versionadded:: 7.0
2985 2985 """
2986 2986 if not self.autoawait:
2987 2987 return False
@@ -3046,7 +3046,7 b' class InteractiveShell(SingletonConfigurable):'
3046 3046 -------
3047 3047 result : :class:`ExecutionResult`
3048 3048
3049 .. versionadded: 7.0
3049 .. versionadded:: 7.0
3050 3050 """
3051 3051 info = ExecutionInfo(
3052 3052 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 119 If `base64` is True, return base64-encoded str instead of raw bytes
120 120 for binary-encoded image formats
121 121
122 .. versionadded: 7.29
122 .. versionadded:: 7.29
123 123 base64 argument
124 124 """
125 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 162 If `base64` is True, return base64-encoded str instead of raw bytes
163 163 for binary-encoded image formats
164 164
165 .. versionadded: 7.29
165 .. versionadded:: 7.29
166 166 base64 argument
167 167 """
168 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 400 def configure_inline_support(shell, backend):
401 401 """
402 .. deprecated: 7.23
402 .. deprecated:: 7.23
403 403
404 404 use `matplotlib_inline.backend_inline.configure_inline_support()`
405 405
@@ -597,6 +597,9 b' class DollarFormatter(FullEvalFormatter):'
597 597 # Re-yield the {foo} style pattern
598 598 yield (txt + literal_txt[continue_from:], field_name, format_spec, conversion)
599 599
600 def __repr__(self):
601 return "<DollarFormatter>"
602
600 603 #-----------------------------------------------------------------------------
601 604 # Utils to columnize a list of string
602 605 #-----------------------------------------------------------------------------
General Comments 0
You need to be logged in to leave comments. Login now