##// END OF EJS Templates
Merge branch '7.x' into auto-backport-of-pr-13600-on-7.x
Matthias Bussonnier -
r27628:504079a8 merge
parent child
Show More
@@ -733,8 +733,10 class MaybeAsyncCompile(Compile):
733 super().__init__()
733 super().__init__()
734 self.flags |= extra_flags
734 self.flags |= extra_flags
735
735
736 def __call__(self, *args, **kwds):
736
737 return compile(*args, **kwds)
737 if sys.version_info < (3,8):
738 def __call__(self, *args, **kwds):
739 return compile(*args, **kwds)
738
740
739
741
740 class MaybeAsyncCommandCompiler(CommandCompiler):
742 class MaybeAsyncCommandCompiler(CommandCompiler):
@@ -319,7 +319,7 class MagicsManager(Configurable):
319
319
320 For example::
320 For example::
321
321
322 c.MagicsManger.lazy_magics = {
322 c.MagicsManager.lazy_magics = {
323 "my_magic": "slow.to.import",
323 "my_magic": "slow.to.import",
324 "my_other_magic": "also.slow",
324 "my_other_magic": "also.slow",
325 }
325 }
@@ -391,6 +391,7 def _decorator_skip_setup():
391 child = pexpect.spawn(
391 child = pexpect.spawn(
392 sys.executable, ["-m", "IPython", "--colors=nocolor"], env=env
392 sys.executable, ["-m", "IPython", "--colors=nocolor"], env=env
393 )
393 )
394 child.str_last_chars = 1000
394 child.timeout = 5 * IPYTHON_TESTING_TIMEOUT_SCALE
395 child.timeout = 5 * IPYTHON_TESTING_TIMEOUT_SCALE
395
396
396 child.expect("IPython")
397 child.expect("IPython")
@@ -24,7 +24,7 The ability to configure magics to be lazily loaded has been added to IPython.
24 See the ``ipython --help-all`` section on ``MagicsManager.lazy_magic``.
24 See the ``ipython --help-all`` section on ``MagicsManager.lazy_magic``.
25 One can now use::
25 One can now use::
26
26
27 c.MagicsManger.lazy_magics = {
27 c.MagicsManager.lazy_magics = {
28 "my_magic": "slow.to.import",
28 "my_magic": "slow.to.import",
29 "my_other_magic": "also.slow",
29 "my_other_magic": "also.slow",
30 }
30 }
General Comments 0
You need to be logged in to leave comments. Login now