Merge pull request #7095 from takluyver/misc-fixing-stuff

Misc cleanup

IPython/kernel/connect.py

@@ -562,7 +562,7 b' class ConnectionFileMixin(LoggingConfigurable):'
         return self._create_connected_socket('hb', identity=identity)
 
     def connect_control(self, identity=None):
-        """return zmq Socket connected to the Heartbeat channel"""
+        """return zmq Socket connected to the Control channel"""
         return self._create_connected_socket('control', identity=identity)
 
 

IPython/qt/kernel_mixins.py

@@ -17,10 +17,6 b' class ChannelQObject(SuperQObject):'
     # Emitted when the channel is stopped.
     stopped = QtCore.Signal()
 
-    #---------------------------------------------------------------------------
-    # Channel interface
-    #---------------------------------------------------------------------------
-
     def start(self):
         """ Reimplemented to emit signal.
         """
@@ -61,10 +57,6 b' class QtShellChannelMixin(ChannelQObject):'
     history_reply = QtCore.Signal(object)
     kernel_info_reply = QtCore.Signal(object)
 
-    #---------------------------------------------------------------------------
-    # 'ShellChannel' interface
-    #---------------------------------------------------------------------------
-
     def call_handlers(self, msg):
         """ Reimplemented to emit signals instead of making callbacks.
         """
@@ -108,10 +100,6 b' class QtIOPubChannelMixin(ChannelQObject):'
     # Emitted when a shutdown is noticed.
     shutdown_reply_received = QtCore.Signal(object)
 
-    #---------------------------------------------------------------------------
-    # 'IOPubChannel' interface
-    #---------------------------------------------------------------------------
-
     def call_handlers(self, msg):
         """ Reimplemented to emit signals instead of making callbacks.
         """
@@ -122,8 +110,6 b' class QtIOPubChannelMixin(ChannelQObject):'
         signal = getattr(self, msg_type + '_received', None)
         if signal:
             signal.emit(msg)
-        elif msg_type in ('stdout', 'stderr'):
-            self.stream_received.emit(msg)
 
     def flush(self):
         """ Reimplemented to ensure that signals are dispatched immediately.
@@ -140,10 +126,6 b' class QtStdInChannelMixin(ChannelQObject):'
     # Emitted when an input request is received.
     input_requested = QtCore.Signal(object)
 
-    #---------------------------------------------------------------------------
-    # 'StdInChannel' interface
-    #---------------------------------------------------------------------------
-
     def call_handlers(self, msg):
         """ Reimplemented to emit signals instead of making callbacks.
         """
@@ -161,14 +143,9 b' class QtHBChannelMixin(ChannelQObject):'
     # Emitted when the kernel has died.
     kernel_died = QtCore.Signal(object)
 
-    #---------------------------------------------------------------------------
-    # 'HBChannel' interface
-    #---------------------------------------------------------------------------
-
     def call_handlers(self, since_last_heartbeat):
         """ Reimplemented to emit signals instead of making callbacks.
         """
-        # Emit the generic signal.
         self.kernel_died.emit(since_last_heartbeat)