From d628471363f86a76aca4187ae1bde3f0aea1189f 2014-05-15 00:42:04
From: MinRK <benjaminrk@gmail.com>
Date: 2014-05-15 00:42:04
Subject: [PATCH] ConnectionFileMixin is a LoggingConfigurable

---

diff --git a/IPython/kernel/client.py b/IPython/kernel/client.py
index a752b85..e7f47cc 100644
--- a/IPython/kernel/client.py
+++ b/IPython/kernel/client.py
@@ -1,23 +1,12 @@
-"""Base class to manage the interaction with a running kernel
-"""
+"""Base class to manage the interaction with a running kernel"""
 
-#-----------------------------------------------------------------------------
-#  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
-#-----------------------------------------------------------------------------
+# Copyright (c) IPython Development Team.
+# Distributed under the terms of the Modified BSD License.
 
 from __future__ import absolute_import
 
 import zmq
 
-# Local imports
-from IPython.config.configurable import LoggingConfigurable
 from IPython.utils.traitlets import (
     Any, Instance, Type,
 )
@@ -31,11 +20,7 @@ from .clientabc import KernelClientABC
 from .connect import ConnectionFileMixin
 
 
-#-----------------------------------------------------------------------------
-# Main kernel client class
-#-----------------------------------------------------------------------------
-
-class KernelClient(LoggingConfigurable, ConnectionFileMixin):
+class KernelClient(ConnectionFileMixin):
     """Communicates with a single kernel on any host via zmq channels.
 
     There are four channels associated with each kernel:
diff --git a/IPython/kernel/connect.py b/IPython/kernel/connect.py
index b369834..122b7de 100644
--- a/IPython/kernel/connect.py
+++ b/IPython/kernel/connect.py
@@ -27,7 +27,7 @@ import zmq
 from IPython.external.ssh import tunnel
 
 # IPython imports
-from IPython.config import Configurable
+from IPython.config import LoggingConfigurable
 from IPython.core.profiledir import ProfileDir
 from IPython.utils.localinterfaces import localhost
 from IPython.utils.path import filefind, get_ipython_dir
@@ -381,7 +381,7 @@ channel_socket_types = {
 
 port_names = [ "%s_port" % channel for channel in ('shell', 'stdin', 'iopub', 'hb', 'control')]
 
-class ConnectionFileMixin(Configurable):
+class ConnectionFileMixin(LoggingConfigurable):
     """Mixin for configurable classes that work with connection files"""
 
     # The addresses for the communication channels
diff --git a/IPython/kernel/manager.py b/IPython/kernel/manager.py
index 5ff7541..f90ed98 100644
--- a/IPython/kernel/manager.py
+++ b/IPython/kernel/manager.py
@@ -5,7 +5,6 @@
 
 from __future__ import absolute_import
 
-# Standard library imports
 import os
 import re
 import signal
@@ -15,8 +14,6 @@ import warnings
 
 import zmq
 
-# Local imports
-from IPython.config.configurable import LoggingConfigurable
 from IPython.utils.importstring import import_item
 from IPython.utils.localinterfaces import is_local_ip, local_ips
 from IPython.utils.path import get_ipython_dir
@@ -35,7 +32,7 @@ from .managerabc import (
 )
 
 
-class KernelManager(LoggingConfigurable, ConnectionFileMixin):
+class KernelManager(ConnectionFileMixin):
     """Manages a single kernel in a subprocess on this host.
 
     This version starts kernels with Popen.