explicit allow_none

SylvainCorlay · SylvainCorlay · commit cbdbaf57f94f · 2015-02-20T18:38:44.000-05:00
diff --git a/IPython/core/shellapp.py b/IPython/core/shellapp.py
@@ -184,15 +184,15 @@ def _extra_extension_changed(self, name, old, new):
     module_to_run = Unicode('', config=True,
         help="Run the module as a script."
     )
-    gui = CaselessStrEnum(gui_keys, config=True,
+    gui = CaselessStrEnum(gui_keys, config=True, allow_none=True,
         help="Enable GUI event loop integration with any of {0}.".format(gui_keys)
     )
-    matplotlib = CaselessStrEnum(backend_keys,
+    matplotlib = CaselessStrEnum(backend_keys, allow_none=True,
         config=True,
         help="""Configure matplotlib for interactive use with
         the default matplotlib backend."""
     )
-    pylab = CaselessStrEnum(backend_keys,
+    pylab = CaselessStrEnum(backend_keys, allow_none=True,
         config=True,
         help="""Pre-load matplotlib and numpy for interactive use,
         selecting a particular matplotlib backend and loop integration.
diff --git a/IPython/kernel/tests/test_message_spec.py b/IPython/kernel/tests/test_message_spec.py
@@ -106,7 +106,7 @@ def _data_changed(self, name, old, new):
 
 class ExecuteReply(Reference):
     execution_count = Integer()
-    status = Enum((u'ok', u'error'))
+    status = Enum((u'ok', u'error'), allow_none=True)
     
     def check(self, d):
         Reference.check(self, d)
@@ -139,7 +139,7 @@ class ArgSpec(Reference):
 
 
 class Status(Reference):
-    execution_state = Enum((u'busy', u'idle', u'starting'))
+    execution_state = Enum((u'busy', u'idle', u'starting'), allow_none=True)
 
 
 class CompleteReply(Reference):
@@ -165,7 +165,7 @@ def check(self, d):
 
 
 class IsCompleteReply(Reference):
-    status = Enum((u'complete', u'incomplete', u'invalid', u'unknown'))
+    status = Enum((u'complete', u'incomplete', u'invalid', u'unknown'), allow_none=True)
     
     def check(self, d):
         Reference.check(self, d)
@@ -187,7 +187,7 @@ class ExecuteInput(Reference):
 
 
 class Stream(Reference):
-    name = Enum((u'stdout', u'stderr'))
+    name = Enum((u'stdout', u'stderr'), allow_none=True)
     text = Unicode()
 
 
diff --git a/IPython/terminal/console/interactiveshell.py b/IPython/terminal/console/interactiveshell.py
@@ -50,7 +50,7 @@ class ZMQTerminalInteractiveShell(TerminalInteractiveShell):
     )
 
     image_handler = Enum(('PIL', 'stream', 'tempfile', 'callable'),
-                         config=True, help=
+                         config=True, allow_none=True, help=
         """
         Handler for image type output.  This is useful, for example,
         when connecting to the kernel in which pylab inline backend is

Original file line number	Diff line number	Diff line change
`@@ -184,15 +184,15 @@ def _extra_extension_changed(self, name, old, new):`
`184`	`184`	`module_to_run = Unicode('', config=True,`
`185`	`185`	`help="Run the module as a script."`
`186`	`186`	`)`
`187`		`- gui = CaselessStrEnum(gui_keys, config=True,`
	`187`	`+ gui = CaselessStrEnum(gui_keys, config=True, allow_none=True,`
`188`	`188`	`help="Enable GUI event loop integration with any of {0}.".format(gui_keys)`
`189`	`189`	`)`
`190`		`- matplotlib = CaselessStrEnum(backend_keys,`
	`190`	`+ matplotlib = CaselessStrEnum(backend_keys, allow_none=True,`
`191`	`191`	`config=True,`
`192`	`192`	`help="""Configure matplotlib for interactive use with`
`193`	`193`	`the default matplotlib backend."""`
`194`	`194`	`)`
`195`		`- pylab = CaselessStrEnum(backend_keys,`
	`195`	`+ pylab = CaselessStrEnum(backend_keys, allow_none=True,`
`196`	`196`	`config=True,`
`197`	`197`	`help="""Pre-load matplotlib and numpy for interactive use,`
`198`	`198`	`selecting a particular matplotlib backend and loop integration.`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ class ZMQTerminalInteractiveShell(TerminalInteractiveShell):`
`50`	`50`	`)`
`51`	`51`
`52`	`52`	`image_handler = Enum(('PIL', 'stream', 'tempfile', 'callable'),`
`53`		`- config=True, help=`
	`53`	`+ config=True, allow_none=True, help=`
`54`	`54`	`"""`
`55`	`55`	`Handler for image type output. This is useful, for example,`
`56`	`56`	`when connecting to the kernel in which pylab inline backend is`