Remove unused copies of validate_string_dict

IPython/kernel/blocking/channels.py

@@ -11,21 +11,6 b' try:'
 except ImportError:
     from Queue import Queue, Empty  # Py 2
 
-from IPython.utils.py3compat import string_types, iteritems
-
-# some utilities to validate message structure, these might get moved elsewhere
-# if they prove to have more generic utility
-
-def validate_string_dict(dct):
-    """Validate that the input is a dict with string keys and values.
-
-    Raises ValueError if not."""
-    for k,v in iteritems(dct):
-        if not isinstance(k, string_types):
-            raise ValueError('key %r in dict must be a string' % k)
-        if not isinstance(v, string_types):
-            raise ValueError('value %r in dict must be a string' % v)
-
 
 class ZMQSocketChannel(object):
     """A ZMQ socket in a simple blocking API"""

IPython/kernel/channels.py

@@ -14,12 +14,10 b' import zmq'
 # import ZMQError in top-level namespace, to avoid ugly attribute-error messages
 # during garbage collection of threads at exit:
 from zmq import ZMQError
-from zmq.eventloop import ioloop, zmqstream
 
 from IPython.core.release import kernel_protocol_version_info
 
 from .channelsabc import HBChannelABC
-from IPython.utils.py3compat import string_types, iteritems
 
 #-----------------------------------------------------------------------------
 # Constants and exceptions
@@ -30,23 +28,6 b' major_protocol_version = kernel_protocol_version_info[0]'
 class InvalidPortNumber(Exception):
     pass
 
-#-----------------------------------------------------------------------------
-# Utility functions
-#-----------------------------------------------------------------------------
-
-# some utilities to validate message structure, these might get moved elsewhere
-# if they prove to have more generic utility
-
-def validate_string_dict(dct):
-    """Validate that the input is a dict with string keys and values.
-
-    Raises ValueError if not."""
-    for k,v in iteritems(dct):
-        if not isinstance(k, string_types):
-            raise ValueError('key %r in dict must be a string' % k)
-        if not isinstance(v, string_types):
-            raise ValueError('value %r in dict must be a string' % v)
-
 
 def make_shell_socket(context, identity, address):
     socket = context.socket(zmq.DEALER)

IPython/kernel/client.py

@@ -4,8 +4,8 b''
 # Distributed under the terms of the Modified BSD License.
 
 from __future__ import absolute_import
-from IPython.kernel.channels import validate_string_dict, major_protocol_version
-from IPython.utils.py3compat import string_types
+from IPython.kernel.channels import major_protocol_version
+from IPython.utils.py3compat import string_types, iteritems
 
 import zmq
 
@@ -21,6 +21,20 b' from .clientabc import KernelClientABC'
 from .connect import ConnectionFileMixin
 
 
+# some utilities to validate message structure, these might get moved elsewhere
+# if they prove to have more generic utility
+
+def validate_string_dict(dct):
+    """Validate that the input is a dict with string keys and values.
+
+    Raises ValueError if not."""
+    for k,v in iteritems(dct):
+        if not isinstance(k, string_types):
+            raise ValueError('key %r in dict must be a string' % k)
+        if not isinstance(v, string_types):
+            raise ValueError('value %r in dict must be a string' % v)
+
+
 class KernelClient(ConnectionFileMixin):
     """Communicates with a single kernel on any host via zmq channels.
 

IPython/qt/client.py

@@ -37,28 +37,11 b' class QtHBChannel(SuperQObject, HBChannel):'
 
 from IPython.core.release import kernel_protocol_version_info
 
-from IPython.utils.py3compat import string_types, iteritems
-
 major_protocol_version = kernel_protocol_version_info[0]
 
 class InvalidPortNumber(Exception):
     pass
 
-# some utilities to validate message structure, these might get moved elsewhere
-# if they prove to have more generic utility
-
-
-def validate_string_dict(dct):
-    """Validate that the input is a dict with string keys and values.
-
-    Raises ValueError if not."""
-    for k,v in iteritems(dct):
-        if not isinstance(k, string_types):
-            raise ValueError('key %r in dict must be a string' % k)
-        if not isinstance(v, string_types):
-            raise ValueError('value %r in dict must be a string' % v)
-
-
 
 class QtZMQSocketChannel(SuperQObject):
     """A ZMQ socket emitting a Qt signal when a message is received."""