##// END OF EJS Templates
Merge pull request #4230 from fperez/mpl-backends...
Merge pull request #4230 from fperez/mpl-backends Switch correctly to the user's default matplotlib backend after inline. If '%matplotlib inline' was called first, we'd incorrectly revert to inline when plain '%matplotlib' was called, instead of loading the user's default GUI. If the user called '%matplotlib' first (without 'inline') it worked correctly, but not in the other order. The fix is to read the backend from the original defaults, not from the runtime data structure. Requires matplotlib 1.1

File last commit:

r11130:de5468b5
r12790:a562753f merge
Show More
manager.py
62 lines | 2.1 KiB | text/x-python | PythonLexer
MinRK
split KernelManager into KernelManager + KernelClient
r10285 """A kernel manager with a tornado IOLoop"""
Brian Granger
Refactoring kernel restarting.
r10282
#-----------------------------------------------------------------------------
# Copyright (C) 2013 The IPython Development Team
#
# Distributed under the terms of the BSD License. The full license is in
# the file COPYING, distributed as part of this software.
#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Imports
#-----------------------------------------------------------------------------
from __future__ import absolute_import
from zmq.eventloop import ioloop
MinRK
cleanup boundaries of MultiKernelManager and KernelRestarter classes...
r10295 from zmq.eventloop.zmqstream import ZMQStream
Brian Granger
Refactoring kernel restarting.
r10282
from IPython.utils.traitlets import (
Instance
)
MinRK
split KernelManager into KernelManager + KernelClient
r10285 from IPython.kernel.manager import KernelManager
MinRK
update imports with new layout
r10284 from .restarter import IOLoopKernelRestarter
Brian Granger
Refactoring kernel restarting.
r10282
#-----------------------------------------------------------------------------
# Code
#-----------------------------------------------------------------------------
MinRK
cleanup boundaries of MultiKernelManager and KernelRestarter classes...
r10295
def as_zmqstream(f):
def wrapped(self, *args, **kwargs):
socket = f(self, *args, **kwargs)
return ZMQStream(socket, self.loop)
return wrapped
MinRK
split KernelManager into KernelManager + KernelClient
r10285 class IOLoopKernelManager(KernelManager):
Brian Granger
Refactoring kernel restarting.
r10282
loop = Instance('zmq.eventloop.ioloop.IOLoop', allow_none=False)
def _loop_default(self):
return ioloop.IOLoop.instance()
MinRK
update imports with new layout
r10284 _restarter = Instance('IPython.kernel.ioloop.IOLoopKernelRestarter')
Brian Granger
Refactoring kernel restarting.
r10282
def start_restarter(self):
if self.autorestart and self.has_kernel:
if self._restarter is None:
self._restarter = IOLoopKernelRestarter(
kernel_manager=self, loop=self.loop,
MinRK
use `parent=self` throughout IPython...
r11064 parent=self, log=self.log
Brian Granger
Refactoring kernel restarting.
r10282 )
self._restarter.start()
def stop_restarter(self):
if self.autorestart:
if self._restarter is not None:
self._restarter.stop()
MinRK
cleanup boundaries of MultiKernelManager and KernelRestarter classes...
r10295
connect_shell = as_zmqstream(KernelManager.connect_shell)
connect_iopub = as_zmqstream(KernelManager.connect_iopub)
connect_stdin = as_zmqstream(KernelManager.connect_stdin)
connect_hb = as_zmqstream(KernelManager.connect_hb)