##// END OF EJS Templates
Remove obsolete Windows workarounds, per @minrk's testing
Thomas Kluyver -
Show More
@@ -252,9 +252,6 b' class KernelManager(LoggingConfigurable, ConnectionFileMixin):'
252 On Windows, this just kills kernels instead, because the shutdown
252 On Windows, this just kills kernels instead, because the shutdown
253 messages don't work.
253 messages don't work.
254 """
254 """
255 # FIXME: Shutdown does not work on Windows due to ZMQ errors!
256 if sys.platform == 'win32' and self.has_kernel:
257 return self._kill_kernel()
258 content = dict(restart=restart)
255 content = dict(restart=restart)
259 msg = self.session.msg("shutdown_request", content=content)
256 msg = self.session.msg("shutdown_request", content=content)
260 self.session.send(self._control_socket, msg)
257 self.session.send(self._control_socket, msg)
@@ -346,11 +343,6 b' class KernelManager(LoggingConfigurable, ConnectionFileMixin):'
346 self._launch_args.update(kw)
343 self._launch_args.update(kw)
347 self.start_kernel(**self._launch_args)
344 self.start_kernel(**self._launch_args)
348
345
349 # FIXME: Messages get dropped in Windows due to probable ZMQ bug
350 # unless there is some delay here.
351 if sys.platform == 'win32':
352 time.sleep(0.2)
353
354 @property
346 @property
355 def has_kernel(self):
347 def has_kernel(self):
356 """Has a kernel been started that we are managing."""
348 """Has a kernel been started that we are managing."""
General Comments 0
You need to be logged in to leave comments. Login now