Minor work on kernelmanager.

* Added new TCPAddress TraitType.

IPython/utils/tests/test_traitlets.py

@@ -27,7 +27,7 b' from unittest import TestCase'
 from IPython.utils.traitlets import (
     HasTraits, MetaHasTraits, TraitType, Any,
     Int, Long, Float, Complex, Str, Unicode, TraitError,
-    Undefined, Type, This, Instance
+    Undefined, Type, This, Instance, TCPAddress
 )
 
 
@@ -684,3 +684,16 b' class TestUnicode(TraitTestBase):'
                       '-10.1', '', u'', 'string', u'string', ]
     _bad_values    = [10, -10, 10L, -10L, 10.1, -10.1, 1j,
                       [10], ['ten'], [u'ten'], {'ten': 10},(10,), None]
+
+
+class TCPAddressTrait(HasTraits):
+
+    value = TCPAddress()
+
+class TestTCPAddress(TraitTestBase):
+
+    obj = TCPAddressTrait()
+
+    _default_value = ('127.0.0.1',0)
+    _good_values = [('localhost',0),('192.168.0.1',1000),('www.google.com',80)]
+    _bad_values = [(0,0),('localhost',10.0),('localhost',-1)]

IPython/utils/traitlets.py

@@ -230,8 +230,7 b' class TraitType(object):'
 
     def get_default_value(self):
         """Create a new instance of the default value."""
-        dv = self.default_value
-        return dv
+        return self.default_value
 
     def instance_init(self, obj):
         """This is called by :meth:`HasTraits.__new__` to finish init'ing.
@@ -798,7 +797,6 b' class Any(TraitType):'
 class Int(TraitType):
     """A integer trait."""
 
-    evaluate = int
     default_value = 0
     info_text = 'an integer'
 
@@ -820,7 +818,6 b' class CInt(Int):'
 class Long(TraitType):
     """A long integer trait."""
 
-    evaluate = long
     default_value = 0L
     info_text = 'a long'
 
@@ -845,7 +842,6 b' class CLong(Long):'
 class Float(TraitType):
     """A float trait."""
 
-    evaluate = float
     default_value = 0.0
     info_text = 'a float'
 
@@ -869,7 +865,6 b' class CFloat(Float):'
 class Complex(TraitType):
     """A trait for complex numbers."""
 
-    evaluate = complex
     default_value = 0.0 + 0.0j
     info_text = 'a complex number'
 
@@ -894,7 +889,6 b' class CComplex(Complex):'
 class Str(TraitType):
     """A trait for strings."""
 
-    evaluate = lambda x: x
     default_value = ''
     info_text = 'a string'
 
@@ -920,7 +914,6 b' class CStr(Str):'
 class Unicode(TraitType):
     """A trait for unicode strings."""
 
-    evaluate = unicode
     default_value = u''
     info_text = 'a unicode string'
 
@@ -944,7 +937,7 b' class CUnicode(Unicode):'
 
 class Bool(TraitType):
     """A boolean (True, False) trait."""
-    evaluate = bool
+
     default_value = False
     info_text = 'a boolean'
 
@@ -1023,3 +1016,23 b' class List(Instance):'
 
         super(List,self).__init__(klass=list, args=args, 
                                   allow_none=allow_none, **metadata)
+
+
+class TCPAddress(TraitType):
+    """A trait for an (ip, port) tuple.
+
+    This allows for both IPv4 IP addresses as well as hostnames.
+    """
+
+    default_value = ('127.0.0.1', 0)
+    info_text = 'an (ip, port) tuple'
+
+    def validate(self, obj, value):
+        if isinstance(value, tuple):
+            if len(value) == 2:
+                if isinstance(value[0], basestring) and isinstance(value[1], int):
+                    port = value[1]
+                    if port >= 0 and port <= 65535:
+                        return value
+        self.error(obj, value)
+

IPython/zmq/kernelmanager.py

@@ -1,4 +1,4 b''
-"""Classes to manage the interaction with a running kernel.
+"""Base classes to manage the interaction with a running kernel.
 
 Todo
 ====
@@ -29,7 +29,7 b' from zmq import POLLIN, POLLOUT, POLLERR'
 from zmq.eventloop import ioloop
 
 # Local imports.
-from IPython.utils.traitlets import HasTraits, Any, Instance, Type
+from IPython.utils.traitlets import HasTraits, Any, Instance, Type, TCPAddress
 from kernel import launch_kernel
 from session import Session
 
@@ -61,9 +61,9 b' class ZmqSocketChannel(Thread):'
 
         Parameters
         ----------
-        context : zmq.Context
+        context : :class:`zmq.Context`
             The ZMQ context to use.
-        session : session.Session
+        session : :class:`session.Session`
             The session to use.
         address : tuple
             Standard (ip, port) tuple that the kernel is listening on.
@@ -289,6 +289,10 b' class SubSocketChannel(ZmqSocketChannel):'
     def flush(self, timeout=1.0):
         """Immediately processes all pending messages on the SUB channel.
 
+        Callers should use this method to ensure that :method:`call_handlers`
+        has been called for all messages that have been received on the
+        0MQ SUB socket of this channel.
+
         This method is thread safe.
 
         Parameters
@@ -324,7 +328,7 b' class SubSocketChannel(ZmqSocketChannel):'
                 msg = self.socket.recv_json(zmq.NOBLOCK)
             except zmq.ZMQError:
                 # Check the errno?
-                # Will this tigger POLLERR?
+                # Will this trigger POLLERR?
                 break
             else:
                 self.call_handlers(msg)
@@ -435,9 +439,9 b' class KernelManager(HasTraits):'
     rep_channel_class = Type(RepSocketChannel)
     
     # Protected traits.
-    _xreq_address = Any
-    _sub_address = Any
-    _rep_address = Any
+    _xreq_address = TCPAddress
+    _sub_address = TCPAddress
+    _rep_address = TCPAddress
     _xreq_channel = Any
     _sub_channel = Any
     _rep_channel = Any
@@ -585,4 +589,3 b' class KernelManager(HasTraits):'
     def rep_address(self):
         return self._rep_address
 
-