Merge b5e9185 into 089a031

docs/source/traits_api_reference/trait_types.rst

@@ -37,6 +37,10 @@ Traits
 
 .. autoclass:: Unicode
 
+.. autoclass:: BaseBytes
+
+.. autoclass:: Bytes
+
 .. autoclass:: BaseBool
 
 .. autoclass:: Bool
@@ -65,6 +69,10 @@ Traits
 
 .. autoclass:: CUnicode
 
+.. autoclass:: BaseCBytes
+
+.. autoclass:: CBytes
+
 .. autoclass:: BaseCBool
 
 .. autoclass:: CBool

docs/source/traits_user_manual/defining.rst

@@ -133,7 +133,7 @@ in the following table.
 .. index:: Boolean type, Bool trait, CBool trait, Complex trait, CComplex trait
 .. index:: complex number type, Float trait, CFloat trait, Int trait, CInt trait
 .. index:: floating point number type, Long trait, CLong trait, Str trait
-.. index:: CStr trait, Unicode; trait, CUnicode trait
+.. index:: CStr trait, Unicode; trait, CUnicode trait, Bytes trait, CBytes trait
 
 .. _predefined-defaults-for-simple-types-table:
 
@@ -149,6 +149,7 @@ Int            CInt          Plain integer          0
 Long           CLong         Long integer           0L
 Str            CStr          String                 ''
 Unicode        CUnicode      Unicode                u''
+Bytes          CBytes        Bytes                  b''
 ============== ============= ====================== ======================
 
 .. index::
@@ -202,6 +203,7 @@ Python built-in functions for type conversion:
 * int()
 * str()
 * unicode()
+* bytes()
 
 .. index::
    single: examples; coercing vs. casting

traits/api.py

@@ -36,9 +36,9 @@
         RGBColor, Font)
 
 from .trait_types import (Any, Generic, Int, Long, Float, Complex, Str, Title,
-        Unicode, Bool, CInt, CLong, CFloat, CComplex, CStr, CUnicode, CBool,
-        String, Regex, Code, HTML, Password, Callable, This, self, Function,
-        Method, Module, Python, ReadOnly, Disallow, Constant,
+        Unicode, Bytes, Bool, CInt, CLong, CFloat, CComplex, CStr, CUnicode,
+        CBytes, CBool, String, Regex, Code, HTML, Password, Callable, This,
+        self, Function, Method, Module, Python, ReadOnly, Disallow, Constant,
         Delegate, DelegatesTo, PrototypedFrom, Expression, PythonValue, File,
         Directory, Range, Enum, Tuple, List, CList, Set, CSet, Dict, Instance,
         AdaptedTo, AdaptsTo, Event, Button, ToolbarButton, Either, Type,
@@ -58,9 +58,9 @@
     pass
 
 from .trait_types import (BaseInt, BaseLong, BaseFloat, BaseComplex, BaseStr,
-        BaseUnicode, BaseBool, BaseCInt, BaseCLong, BaseCFloat, BaseCComplex,
-        BaseCStr, BaseCUnicode, BaseCBool, BaseFile, BaseDirectory, BaseRange,
-        BaseEnum, BaseTuple, BaseInstance)
+        BaseUnicode, BaseBytes, BaseBool, BaseCInt, BaseCLong, BaseCFloat,
+        BaseCComplex, BaseCStr, BaseCUnicode, BaseCBool, BaseFile,
+        BaseDirectory, BaseRange, BaseEnum, BaseTuple, BaseInstance)
 
 from .trait_types import UUID, ValidatedTuple
 

traits/tests/test_traits.py

@@ -19,10 +19,11 @@
 
 from traits.testing.unittest_tools import unittest
 
-from ..api import (Any, CFloat, CInt, CLong, Delegate, Float, HasTraits,
-                   Instance, Int, List, Long, Str, Trait, TraitError,
-                   TraitList, TraitPrefixList, TraitPrefixMap, TraitRange,
-                   Tuple, pop_exception_handler, push_exception_handler)
+from ..api import (Any, Bytes, CBytes, CFloat, CInt, CLong, Delegate, Float,
+                   HasTraits, Instance, Int, List, Long, Str, Trait,
+                   TraitError, TraitList, TraitPrefixList, TraitPrefixMap,
+                   TraitRange, Tuple, pop_exception_handler,
+                   push_exception_handler)
 
 #  Base unit test classes:
 
@@ -323,6 +324,52 @@ def coerce(self, value):
         return str(value)
 
 
+class BytesTrait(HasTraits):
+    value = Bytes(b'bytes')
+
+
+version_dependent = ['', 'string']
+
+
+class BytesTest(StringTest):
+
+    obj = BytesTrait()
+
+    _default_value = b'bytes'
+    _good_values = [b'', b'10', b'-10'] + (version_dependent
+        if sys.version_info[0] == 2 else [])
+    _bad_values = [10, -10, 10L, 10.1, u'unicode', u'', [b''], [b'bytes'], [0],
+        {b'ten': b'10'}, (b'',), None, True] + (version_dependent
+        if sys.version_info[0] == 3 else [])
+
+    def coerce(self, value):
+        return bytes(value)
+
+
+class CoercibleBytesTrait(HasTraits):
+    value = CBytes(b'bytes')
+
+version_dependent = [
+    '', 'string', u'unicode', u'', -10, 10.1, [b''], [b'bytes'],
+    [-10], (-10,), {-10: 'foo'}, set([-10]),
+    [256], (256,), {256: 'foo'}, set([256]),
+    {b'ten': b'10'}, (b'',), None,
+]
+
+class CoercibleBytesTest(StringTest):
+
+    obj = CoercibleBytesTrait()
+
+    _default_value = b'bytes'
+    _good_values = [
+        b'', b'10', b'-10', 10, 10L, [10], (10,), set([10]), {10: 'foo'},
+        True] + (version_dependent if sys.version_info[0] == 2 else [])
+    _bad_values = (version_dependent if sys.version_info[0] == 3 else [])
+
+    def coerce(self, value):
+        return bytes(value)
+
+
 class EnumTrait(HasTraits):
     value = Trait([1, 'one', 2, 'two', 3, 'three', 4.4, u'four.four'])
 

traits/trait_types.py

@@ -430,6 +430,51 @@ class Unicode ( BaseUnicode ):
     #: The C-level fast validator to use:
     fast_validate = ( 11, unicode, None, str )
 
+
+#-------------------------------------------------------------------------------
+#  'BaseBytes' and 'Bytes' traits:
+#-------------------------------------------------------------------------------
+
+class BaseBytes(TraitType):
+    """ Defines a trait whose value must be a Python bytes string.
+    """
+
+    #: The default value for the trait:
+    default_value = b''
+
+    #: A description of the type of value this trait accepts:
+    info_text = 'a bytes string'
+
+    def validate(self, object, name, value):
+        """ Validates that a specified value is valid for this trait.
+
+            Note: The 'fast validator' version performs this check in C.
+        """
+        if isinstance(value, bytes):
+            return value
+
+        self.error(object, name, value)
+
+    def create_editor(self):
+        """ Returns the default traits UI editor for this type of trait.
+        """
+        from .traits import multi_line_text_editor
+        auto_set = self.auto_set
+        if auto_set is None:
+            auto_set = True
+        enter_set = self.enter_set or False
+
+        return multi_line_text_editor(auto_set, enter_set)
+
+
+class Bytes(BaseBytes):
+    """ Defines a trait whose value must be a Python bytes string using a
+        C-level fast validator.
+    """
+
+    #: The C-level fast validator to use:
+    fast_validate = (11, bytes)
+
 #-------------------------------------------------------------------------------
 #  'BaseBool' and 'Bool' traits:
 #-------------------------------------------------------------------------------
@@ -659,6 +704,35 @@ class CUnicode ( BaseCUnicode ):
     #: The C-level fast validator to use:
     fast_validate = ( 12, unicode )
 
+#-------------------------------------------------------------------------------
+#  'BaseCBytes' and 'CBytes' traits:
+#-------------------------------------------------------------------------------
+
+class BaseCBytes(BaseBytes):
+    """ Defines a trait whose value must be a Python bytes object and which
+        supports coercions of non-bytes values to bytes.
+    """
+
+    def validate(self, object, name, value):
+        """ Validates that a specified value is valid for this trait.
+
+            Note: The 'fast validator' version performs this check in C.
+        """
+        try:
+            return bytes(value)
+        except:
+            self.error(object, name, value)
+
+
+class CBytes(BaseCBytes):
+    """ Defines a trait whose value must be a Python bytes and which
+        supports coercions of non-bytes values bytes using a C-level
+        fast validator.
+    """
+
+    #: The C-level fast validator to use:
+    fast_validate = (12, bytes)
+
 #-------------------------------------------------------------------------------
 #  'BaseCBool' and 'CBool' traits:
 #-------------------------------------------------------------------------------