diff --git a/IPython/config/tests/test_configurable.py b/IPython/config/tests/test_configurable.py index 5bcf7d7..4073912 100644 --- a/IPython/config/tests/test_configurable.py +++ b/IPython/config/tests/test_configurable.py @@ -47,9 +47,11 @@ class MyConfigurable(Configurable): mc_help=u"""MyConfigurable options ---------------------- -MyConfigurable.a : Int [default: 1] +MyConfigurable.a : Int + Default: 1 The integer a. -MyConfigurable.b : Float [default: 1.0] +MyConfigurable.b : Float + Default: 1.0 The integer b.""" class Foo(Configurable): diff --git a/IPython/testing/tools.py b/IPython/testing/tools.py index 52130ee..eea9634 100644 --- a/IPython/testing/tools.py +++ b/IPython/testing/tools.py @@ -197,7 +197,10 @@ def ipexec(fname, options=None): # For these subprocess calls, eliminate all prompt printing so we only see # output from script execution - prompt_opts = ['pi1=""', 'pi2=""', 'po=""'] + prompt_opts = [ 'InteractiveShell.prompt_in1=""', + 'InteractiveShell.prompt_in2=""', + 'InteractiveShell.prompt_out=""' + ] cmdargs = ' '.join(default_argv() + prompt_opts + options) _ip = get_ipython()