fix dtype python constructor args

Author: cyrush

src/libs/conduit/python/conduit_python.cpp

@@ -284,22 +284,10 @@ static PyObject* PyConduit_Convert_Node_To_Python(Node& node);
 //---------------------------------------------------------------------------//
 static PyObject *
 PyConduit_DataType_new(PyTypeObject* type,
-                       PyObject* args,
-                       PyObject* kwds)
+                       PyObject*, // args -- unused
+                       PyObject*) // kwds -- unused
 {
-    /// TODO: args and kwargs
-
-    static const char *kwlist[] = {"value", NULL};
-    PyObject* value = NULL;
-    if (!PyArg_ParseTupleAndKeywords(args,
-                                     kwds,
-                                     "|O",
-                                     const_cast<char**>(kwlist),
-                                     &value))
-    {
-        return (NULL);
-    }
-
+    // `_new` is used to alloc the object, `_init` is effectively the constructor
     PyConduit_DataType* self = (PyConduit_DataType*)PyType_GenericAlloc(type,0);
     return ((PyObject*)self);
 }
@@ -3297,6 +3285,7 @@ PyConduit_Generator_new(PyTypeObject *type,
                         PyObject*, // args -- unused
                         PyObject*) // kwds -- unused
 {
+    // `_new` is used to alloc the object, `_init` is effectively the constructor
     PyConduit_Generator *self = (PyConduit_Generator*)PyType_GenericAlloc(type,0);
 
     if (self)
@@ -3591,7 +3580,7 @@ PyConduit_Schema_new(PyTypeObject* type,
                      PyObject*, // args -- unused
                      PyObject*) // kwds -- unused
 {
-
+    // `_new` is used to alloc the object, `_init` is effectively the constructor
     PyConduit_Schema *self = (PyConduit_Schema*)PyType_GenericAlloc(type,0);
 
     if (self)
@@ -4652,20 +4641,10 @@ static PyTypeObject PyConduit_Schema_TYPE = {
 //---------------------------------------------------------------------------//
 static PyObject *
 PyConduit_NodeIterator_new(PyTypeObject *type,
-                            PyObject *args,
-                            PyObject *kwds)
+                           PyObject*, // args -- unused
+                           PyObject*) // kwds -- unused
 {
-    static const char *kwlist[] = {"value", NULL};
-    PyObject* value = NULL;
-    if (!PyArg_ParseTupleAndKeywords(args,
-                                     kwds,
-                                     "|O",
-                                     const_cast<char**>(kwlist),
-                                     &value))
-    {
-        return (NULL);
-    }
-
+    // `_new` is used to alloc the object, `_init` is effectively the constructor
     PyConduit_DataType *self = (PyConduit_DataType*)PyType_GenericAlloc(type,0);
     return ((PyObject*)self);
 }
@@ -5154,20 +5133,10 @@ PyConduit_Fill_DataArray_From_PyArray(DataArray<T> &conduit_array,
 //---------------------------------------------------------------------------//
 static PyObject *
 PyConduit_Node_new(PyTypeObject* type,
-                   PyObject* args,
-                   PyObject* kwds)
+                   PyObject*, // args -- unused
+                   PyObject*) // kwds -- unused
 {
-    static const char *kwlist[] = {"value", NULL};
-    PyObject* value = NULL;
-    if (!PyArg_ParseTupleAndKeywords(args,
-                                     kwds,
-                                     "|O",
-                                     const_cast<char**>(kwlist),
-                                     &value))
-    {
-        return (NULL);
-    }
-
+    // `_new` is used to alloc the object, `_init` is effectively the constructor
     PyConduit_Node* self = (PyConduit_Node*)PyType_GenericAlloc(type,0);
 
     if (self)

src/tests/conduit/python/t_python_conduit_datatype.py

@@ -58,13 +58,13 @@ def test_construction(self):
         dt.set_offset(0);
         dt.set_stride(4);
         dt.set_element_bytes(4);
-        
+
         dt2 = DataType(dt)
         self.assertEqual(dt.id(),dt2.id())
         self.assertEqual(dt.number_of_elements(),dt2.number_of_elements())
         self.assertEqual(dt.offset(),dt2.offset())
         self.assertEqual(dt.stride(),dt2.stride())
-        self.assertEqual(dt.element_bytes(),dt2.element_bytes())        
+        self.assertEqual(dt.element_bytes(),dt2.element_bytes())
         self.assertEqual(dt.endianness(),dt2.endianness())
 
         dt3 = DataType()
@@ -79,7 +79,7 @@ def test_construction(self):
         self.assertEqual(dt2.stride(),dt3.stride())
         self.assertEqual(dt2.element_bytes(),dt3.element_bytes())
         self.assertEqual(dt2.endianness(),dt3.endianness())
-        
+
         print(dt)
         print(dt2)
         print(dt3)
@@ -241,6 +241,44 @@ def test_enum_ids(self):
         self.assertEqual(DataType.float32().id(), DataType.float32_id())
         self.assertEqual(DataType.float64().id(), DataType.float64_id())
 
+    def test_construct_from_args(self):
+        # string case
+        dt = DataType("int64",
+                      7, # num ele
+                      10, # offset
+                      16, # stride
+                      8, # ele bytes
+                      0) # endianness id
+        self.assertTrue(dt.is_int64())
+        self.assertEqual(dt.number_of_elements(),7)
+        self.assertEqual(dt.offset(),10)
+        self.assertEqual(dt.stride(),16)
+        self.assertEqual(dt.element_bytes(),8)
+        self.assertEqual(dt.endianness(),0)
+        # id case
+        dt = DataType(DataType.name_to_id("int64"),
+                      7, # num ele
+                      10, # offset
+                      16, # stride
+                      8, # ele bytes
+                      0) # endianness id
+        dt = DataType.int64(7,10,16,8)
+        self.assertTrue(dt.is_int64())
+        self.assertEqual(dt.number_of_elements(),7)
+        self.assertEqual(dt.offset(),10)
+        self.assertEqual(dt.stride(),16)
+        self.assertEqual(dt.element_bytes(),8)
+        self.assertEqual(dt.endianness(),0)
+
+        # helper func case
+        dt = DataType.int64(7,10,16,8,0)
+        self.assertTrue(dt.is_int64())
+        self.assertEqual(dt.number_of_elements(),7)
+        self.assertEqual(dt.offset(),10)
+        self.assertEqual(dt.stride(),16)
+        self.assertEqual(dt.element_bytes(),8)
+        self.assertEqual(dt.endianness(),0)
+
     def test_to_string_and_friends(self):
         dtypes = [ DataType.float64(),
                    DataType.object(),