##// END OF EJS Templates
Respect user's settings for prompt separators in %doctest_mode
fperez -
Show More
@@ -1,7 +1,7 b''
1 # -*- coding: utf-8 -*-
1 # -*- coding: utf-8 -*-
2 """Magic functions for InteractiveShell.
2 """Magic functions for InteractiveShell.
3
3
4 $Id: Magic.py 2917 2007-12-31 14:11:34Z vivainio $"""
4 $Id: Magic.py 2996 2008-01-30 06:31:39Z fperez $"""
5
5
6 #*****************************************************************************
6 #*****************************************************************************
7 # Copyright (C) 2001 Janko Hauser <jhauser@zscout.de> and
7 # Copyright (C) 2001 Janko Hauser <jhauser@zscout.de> and
@@ -3235,7 +3235,6 b' Defaulting color scheme to \'NoColor\'"""'
3235 mode = save_dstore('mode',False)
3235 mode = save_dstore('mode',False)
3236 save_dstore('rc_pprint',rc.pprint)
3236 save_dstore('rc_pprint',rc.pprint)
3237 save_dstore('xmode',shell.InteractiveTB.mode)
3237 save_dstore('xmode',shell.InteractiveTB.mode)
3238 save_dstore('rc_separate_in',rc.separate_in)
3239 save_dstore('rc_separate_out',rc.separate_out)
3238 save_dstore('rc_separate_out',rc.separate_out)
3240 save_dstore('rc_separate_out2',rc.separate_out2)
3239 save_dstore('rc_separate_out2',rc.separate_out2)
3241 save_dstore('rc_prompts_pad_left',rc.prompts_pad_left)
3240 save_dstore('rc_prompts_pad_left',rc.prompts_pad_left)
@@ -3248,7 +3247,6 b' Defaulting color scheme to \'NoColor\'"""'
3248 oc.prompt2.p_template = '... '
3247 oc.prompt2.p_template = '... '
3249 oc.prompt_out.p_template = ''
3248 oc.prompt_out.p_template = ''
3250
3249
3251 oc.prompt1.sep = '\n'
3252 oc.output_sep = ''
3250 oc.output_sep = ''
3253 oc.output_sep2 = ''
3251 oc.output_sep2 = ''
3254
3252
@@ -3267,7 +3265,6 b' Defaulting color scheme to \'NoColor\'"""'
3267 oc.prompt2.p_template = rc.prompt_in2
3265 oc.prompt2.p_template = rc.prompt_in2
3268 oc.prompt_out.p_template = rc.prompt_out
3266 oc.prompt_out.p_template = rc.prompt_out
3269
3267
3270 oc.prompt1.sep = dstore.rc_separate_in
3271 oc.output_sep = dstore.rc_separate_out
3268 oc.output_sep = dstore.rc_separate_out
3272 oc.output_sep2 = dstore.rc_separate_out2
3269 oc.output_sep2 = dstore.rc_separate_out2
3273
3270
@@ -1,5 +1,9 b''
1 2008-01-29 Fernando Perez <Fernando.Perez@colorado.edu>
1 2008-01-29 Fernando Perez <Fernando.Perez@colorado.edu>
2
2
3 * IPython/Magic.py (magic_doctest_mode): respect the user's
4 settings for input separators rather than overriding them. After
5 a report by Jeff Kowalczyk <jtk-AT-yahoo.com>
6
3 * IPython/history.py (magic_history): Add support for declaring an
7 * IPython/history.py (magic_history): Add support for declaring an
4 output file directly from the history command.
8 output file directly from the history command.
5
9
General Comments 0
You need to be logged in to leave comments. Login now