##// END OF EJS Templates
remove unnecessary allow_none=True
Sylvain Corlay -
Show More
@@ -174,7 +174,7 b' class Application(SingletonConfigurable):'
174 _log_handler.setFormatter(_log_formatter)
174 _log_handler.setFormatter(_log_formatter)
175
175
176
176
177 log = Instance(logging.Logger, allow_none=True)
177 log = Instance(logging.Logger)
178 def _log_default(self):
178 def _log_default(self):
179 """Start logging for this application.
179 """Start logging for this application.
180
180
@@ -372,7 +372,7 b' class LoggingConfigurable(Configurable):'
372 is to get the logger from the currently running Application.
372 is to get the logger from the currently running Application.
373 """
373 """
374
374
375 log = Instance('logging.Logger', allow_none=True)
375 log = Instance('logging.Logger')
376 def _log_default(self):
376 def _log_default(self):
377 from IPython.utils import log
377 from IPython.utils import log
378 return log.get_logger()
378 return log.get_logger()
@@ -301,7 +301,7 b' class InteractiveShell(SingletonConfigurable):'
301 data_pub_class = None
301 data_pub_class = None
302
302
303 exit_now = CBool(False)
303 exit_now = CBool(False)
304 exiter = Instance(ExitAutocall, allow_none=True)
304 exiter = Instance(ExitAutocall)
305 def _exiter_default(self):
305 def _exiter_default(self):
306 return ExitAutocall(self)
306 return ExitAutocall(self)
307 # Monotonically increasing execution counter
307 # Monotonically increasing execution counter
@@ -453,7 +453,7 b' class InteractiveShell(SingletonConfigurable):'
453
453
454
454
455 # Private interface
455 # Private interface
456 _post_execute = Instance(dict, allow_none=True)
456 _post_execute = Dict()
457
457
458 # Tracks any GUI loop loaded for pylab
458 # Tracks any GUI loop loaded for pylab
459 pylab_gui_select = None
459 pylab_gui_select = None
@@ -20,7 +20,7 b' class ClusterManager(LoggingConfigurable):'
20 delay = Float(1., config=True,
20 delay = Float(1., config=True,
21 help="delay (in s) between starting the controller and the engines")
21 help="delay (in s) between starting the controller and the engines")
22
22
23 loop = Instance('zmq.eventloop.ioloop.IOLoop', allow_none=True)
23 loop = Instance('zmq.eventloop.ioloop.IOLoop')
24 def _loop_default(self):
24 def _loop_default(self):
25 from zmq.eventloop.ioloop import IOLoop
25 from zmq.eventloop.ioloop import IOLoop
26 return IOLoop.instance()
26 return IOLoop.instance()
@@ -367,7 +367,7 b' class ZMQInteractiveShell(InteractiveShell):'
367 # will print a warning in the absence of readline.
367 # will print a warning in the absence of readline.
368 autoindent = CBool(False)
368 autoindent = CBool(False)
369
369
370 exiter = Instance(ZMQExitAutocall, allow_none=True)
370 exiter = Instance(ZMQExitAutocall)
371 def _exiter_default(self):
371 def _exiter_default(self):
372 return ZMQExitAutocall(self)
372 return ZMQExitAutocall(self)
373
373
@@ -123,7 +123,7 b' class BaseParallelApplication(BaseIPythonApplication):'
123 def _config_files_default(self):
123 def _config_files_default(self):
124 return ['ipcontroller_config.py', 'ipengine_config.py', 'ipcluster_config.py']
124 return ['ipcontroller_config.py', 'ipengine_config.py', 'ipcluster_config.py']
125
125
126 loop = Instance('zmq.eventloop.ioloop.IOLoop', allow_none=True)
126 loop = Instance('zmq.eventloop.ioloop.IOLoop')
127 def _loop_default(self):
127 def _loop_default(self):
128 from zmq.eventloop.ioloop import IOLoop
128 from zmq.eventloop.ioloop import IOLoop
129 return IOLoop.instance()
129 return IOLoop.instance()
@@ -52,7 +52,7 b' class LogWatcher(LoggingConfigurable):'
52 # internals
52 # internals
53 stream = Instance('zmq.eventloop.zmqstream.ZMQStream', allow_none=True)
53 stream = Instance('zmq.eventloop.zmqstream.ZMQStream', allow_none=True)
54
54
55 context = Instance(zmq.Context, allow_none=True)
55 context = Instance(zmq.Context)
56 def _context_default(self):
56 def _context_default(self):
57 return zmq.Context.instance()
57 return zmq.Context.instance()
58
58
@@ -79,7 +79,7 b' class HeartMonitor(LoggingConfigurable):'
79
79
80 pingstream=Instance('zmq.eventloop.zmqstream.ZMQStream', allow_none=True)
80 pingstream=Instance('zmq.eventloop.zmqstream.ZMQStream', allow_none=True)
81 pongstream=Instance('zmq.eventloop.zmqstream.ZMQStream', allow_none=True)
81 pongstream=Instance('zmq.eventloop.zmqstream.ZMQStream', allow_none=True)
82 loop = Instance('zmq.eventloop.ioloop.IOLoop', allow_none=True)
82 loop = Instance('zmq.eventloop.ioloop.IOLoop')
83 def _loop_default(self):
83 def _loop_default(self):
84 return ioloop.IOLoop.instance()
84 return ioloop.IOLoop.instance()
85
85
General Comments 0
You need to be logged in to leave comments. Login now