[python-hdf5storage] 110/152: Added numpy.void support.

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to annotated tag 0.1
in repository python-hdf5storage.

commit bc4bab81165f1da01884ce4a2ecd1e3918bdaa6e
Author: Freja Nordsiek <fnordsie at gmail.com>
Date:   Thu Feb 13 16:23:27 2014 -0500

    Added numpy.void support.
---
 README.rst                             | 1 +
 doc/source/hdf5storage.Marshallers.rst | 5 +++--
 doc/source/storage_format.rst          | 2 ++
 hdf5storage/Marshallers.py             | 4 ++--
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/README.rst b/README.rst
index 44a774e..6d59776 100644
--- a/README.rst
+++ b/README.rst
@@ -89,6 +89,7 @@ frozenset      0.1      np.object\_                 cell         0.1
 cl.deque       0.1      np.object\_                 cell         0.1
 dict           0.1                                  struct       0.1 [4]_
 np.bool\_      0.1                                  logical      0.1
+np.void        0.1
 np.uint8       0.1                                  uint8        0.1
 np.uint16      0.1                                  uint16       0.1
 np.uint32      0.1                                  uint32       0.1
diff --git a/doc/source/hdf5storage.Marshallers.rst b/doc/source/hdf5storage.Marshallers.rst
index 1073b65..22a62be 100644
--- a/doc/source/hdf5storage.Marshallers.rst
+++ b/doc/source/hdf5storage.Marshallers.rst
@@ -48,7 +48,7 @@ NumpyScalarArrayMarshaller
    .. autoinstanceattribute:: NumpyScalarArrayMarshaller.types
       :annotation: = [np.ndarray, np.matrix,
                       np.chararray,
-                      np.bool_,
+                      np.bool_, np.void,
                       np.uint8, np.uint16, np.uint32, np.uint64,
                       np.int8, np.int16, np.int32, np.int64,
                       np.float16, np.float32, np.float64,
@@ -58,7 +58,8 @@ NumpyScalarArrayMarshaller
    .. autoinstanceattribute:: NumpyScalarArrayMarshaller.python_type_strings
       :annotation: = ['numpy.ndarray', 'numpy.matrix',
                       'numpy.chararray',
-                      'numpy.bool_', 'numpy.uint8', 'numpy.uint16',
+                      'numpy.bool_', 'numpy.void',
+                      'numpy.uint8', 'numpy.uint16',
                       'numpy.uint32', 'numpy.uint64', 'numpy.int8',
 		      'numpy.int16', 'numpy.int32', 'numpy.int64',
                       'numpy.float16', 'numpy.float32', 'numpy.float64',
diff --git a/doc/source/storage_format.rst b/doc/source/storage_format.rst
index e63cbaa..5b5bbbb 100644
--- a/doc/source/storage_format.rst
+++ b/doc/source/storage_format.rst
@@ -65,6 +65,7 @@ frozenset      0.1      np.object\_                        Dataset
 cl.deque       0.1      np.object\_                        Dataset
 dict [4]_      0.1                                         Group
 np.bool\_      0.1      not or np.uint8 [1]_               Dataset
+np.void        0.1                                         Dataset
 np.uint8       0.1                                         Dataset
 np.uint16      0.1                                         Dataset
 np.uint32      0.1                                         Dataset
@@ -140,6 +141,7 @@ frozenset      'frozenset'          'object'                     'cell'
 cl.deque       'collections.deque'  'object'                     'cell'
 dict           'dict'                                            'struct'
 np.bool\_      'numpy.bool'         'bool'                       'logical'           1
+np.void        'numpy.void'         'void#' [5]_
 np.uint8       'numpy.uint8'        'uint8'                      'uint8'
 np.uint16      'numpy.uint16'       'uint16'                     'uint16'
 np.uint32      'numpy.uint32'       'uint32'                     'uint32'
diff --git a/hdf5storage/Marshallers.py b/hdf5storage/Marshallers.py
index 0ffbd7f..752eef3 100644
--- a/hdf5storage/Marshallers.py
+++ b/hdf5storage/Marshallers.py
@@ -311,7 +311,7 @@ class NumpyScalarArrayMarshaller(TypeMarshaller):
                                    'MATLAB_int_decode'}
         self.types = [np.ndarray, np.matrix,
                       np.chararray,
-                      np.bool_,
+                      np.bool_, np.void,
                       np.uint8, np.uint16, np.uint32, np.uint64,
                       np.int8, np.int16, np.int32, np.int64,
                       np.float16, np.float32, np.float64,
@@ -319,7 +319,7 @@ class NumpyScalarArrayMarshaller(TypeMarshaller):
                       np.bytes_, np.str_, np.object_]
         self.python_type_strings = ['numpy.ndarray', 'numpy.matrix',
                                     'numpy.chararray',
-                                    'numpy.bool_',
+                                    'numpy.bool_', 'numpy.void',
                                     'numpy.uint8', 'numpy.uint16',
                                     'numpy.uint32', 'numpy.uint64',
                                     'numpy.int8', 'numpy.int16',

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/python-hdf5storage.git