##// END OF EJS Templates
use Context.instance() for default in SessionFactory
MinRK -
Show More
@@ -15,6 +15,7 b''
15 import logging
15 import logging
16 import os
16 import os
17
17
18 import zmq
18 from zmq.eventloop.ioloop import IOLoop
19 from zmq.eventloop.ioloop import IOLoop
19
20
20 from IPython.config.configurable import Configurable
21 from IPython.config.configurable import Configurable
@@ -38,7 +39,10 b' class SessionFactory(LoggingFactory):'
38 """The Base factory from which every factory in IPython.parallel inherits"""
39 """The Base factory from which every factory in IPython.parallel inherits"""
39
40
40 # not configurable:
41 # not configurable:
41 context = Instance('zmq.Context', (), {})
42 context = Instance('zmq.Context')
43 def _context_default(self):
44 return zmq.Context.instance()
45
42 session = Instance('IPython.parallel.streamsession.StreamSession')
46 session = Instance('IPython.parallel.streamsession.StreamSession')
43 loop = Instance('zmq.eventloop.ioloop.IOLoop', allow_none=False)
47 loop = Instance('zmq.eventloop.ioloop.IOLoop', allow_none=False)
44 def _loop_default(self):
48 def _loop_default(self):
General Comments 0
You need to be logged in to leave comments. Login now