From 775fc5af200aa94a2da6660134abf3efb73884c6 2015-03-29 20:03:39
From: Min RK <benjaminrk@gmail.com>
Date: 2015-03-29 20:03:39
Subject: [PATCH] missing allow_none=True in IPython.parallel
---

diff --git a/ipython_parallel/client/client.py b/ipython_parallel/client/client.py
index c5a0850..4d9b0dd 100644
--- a/ipython_parallel/client/client.py
+++ b/ipython_parallel/client/client.py
@@ -345,16 +345,15 @@ class Client(HasTraits):
     _ids = List()
     _connected=Bool(False)
     _ssh=Bool(False)
-    _context = Instance('zmq.Context')
+    _context = Instance('zmq.Context', allow_none=True)
     _config = Dict()
     _engines=Instance(util.ReverseDict, (), {})
-    # _hub_socket=Instance('zmq.Socket')
-    _query_socket=Instance('zmq.Socket')
-    _control_socket=Instance('zmq.Socket')
-    _iopub_socket=Instance('zmq.Socket')
-    _notification_socket=Instance('zmq.Socket')
-    _mux_socket=Instance('zmq.Socket')
-    _task_socket=Instance('zmq.Socket')
+    _query_socket=Instance('zmq.Socket', allow_none=True)
+    _control_socket=Instance('zmq.Socket', allow_none=True)
+    _iopub_socket=Instance('zmq.Socket', allow_none=True)
+    _notification_socket=Instance('zmq.Socket', allow_none=True)
+    _mux_socket=Instance('zmq.Socket', allow_none=True)
+    _task_socket=Instance('zmq.Socket', allow_none=True)
     _task_scheme=Unicode()
     _closed = False
     _ignored_control_replies=Integer(0)
diff --git a/ipython_parallel/client/view.py b/ipython_parallel/client/view.py
index af851bc..7f570de 100644
--- a/ipython_parallel/client/view.py
+++ b/ipython_parallel/client/view.py
@@ -109,7 +109,7 @@ class View(HasTraits):
     results = Dict()
     client = Instance('ipython_parallel.Client', allow_none=True)
 
-    _socket = Instance('zmq.Socket')
+    _socket = Instance('zmq.Socket', allow_none=True)
     _flag_names = List(['targets', 'block', 'track'])
     _in_sync_results = Bool(False)
     _targets = Any()