diff --git a/IPython/core/magics/basic.py b/IPython/core/magics/basic.py index 980a0a6..a3db9ea 100644 --- a/IPython/core/magics/basic.py +++ b/IPython/core/magics/basic.py @@ -427,7 +427,7 @@ Defaulting color scheme to 'NoColor'""" save_dstore('rc_separate_out2',shell.separate_out2) save_dstore('rc_prompts_pad_left',pm.justify) save_dstore('rc_separate_in',shell.separate_in) - save_dstore('rc_plain_text_only',disp_formatter.plain_text_only) + save_dstore('rc_active_types',disp_formatter.active_types) save_dstore('prompt_templates',(pm.in_template, pm.in2_template, pm.out_template)) if mode == False: @@ -444,7 +444,7 @@ Defaulting color scheme to 'NoColor'""" pm.justify = False ptformatter.pprint = False - disp_formatter.plain_text_only = True + disp_formatter.active_types = ['text/plain'] shell.magic('xmode Plain') else: @@ -459,7 +459,7 @@ Defaulting color scheme to 'NoColor'""" pm.justify = dstore.rc_prompts_pad_left ptformatter.pprint = dstore.rc_pprint - disp_formatter.plain_text_only = dstore.rc_plain_text_only + disp_formatter.active_types = dstore.rc_active_types shell.magic('xmode ' + dstore.xmode) diff --git a/IPython/kernel/zmq/zmqshell.py b/IPython/kernel/zmq/zmqshell.py index 3015f59..f4ff07a 100644 --- a/IPython/kernel/zmq/zmqshell.py +++ b/IPython/kernel/zmq/zmqshell.py @@ -150,18 +150,18 @@ class KernelMagics(Magics): # save a few values we'll need to recover later mode = save_dstore('mode', False) save_dstore('rc_pprint', ptformatter.pprint) - save_dstore('rc_plain_text_only',disp_formatter.plain_text_only) + save_dstore('rc_active_types',disp_formatter.active_types) save_dstore('xmode', shell.InteractiveTB.mode) if mode == False: # turn on ptformatter.pprint = False - disp_formatter.plain_text_only = True + disp_formatter.active_types = ['text/plain'] shell.magic('xmode Plain') else: # turn off ptformatter.pprint = dstore.rc_pprint - disp_formatter.plain_text_only = dstore.rc_plain_text_only + disp_formatter.active_types = dstore.rc_active_types shell.magic("xmode " + dstore.xmode) # Store new mode and inform on console