Merge main

kumaraditya303 · Dec 21, 2022 · Jul 18, 2019 · Jul 18, 2019 · Jul 18, 2019 · Jul 18, 2019
commit 76eeee2811ed48deba02aa5d83c029c164772d59
diff --git a/Lib/test/test_ctypes/test_struct_fields.py b/Lib/test/test_ctypes/test_struct_fields.py
@@ -48,9 +48,17 @@ class Y(X):
 
     def test_5(self):
         class X(Structure):
+<<<<<<< HEAD:Lib/ctypes/test/test_struct_fields.py
             _fields_ = [("x", c_int)]
         CField = type(X.x)
         self.assertRaises(TypeError, CField)
+=======
+            _fields_ = (("char", c_char * 5),)
+
+        x = X(b'#' * 5)
+        x.char = b'a\0b\0'
+        self.assertEqual(bytes(x), b'a\x00###')
+>>>>>>> origin/main:Lib/test/test_ctypes/test_struct_fields.py
 
     # __set__ and __get__ should raise a TypeError in case their self
     # argument is not a ctype instance.

diff --git a/Modules/_ctypes/cfield.c b/Modules/_ctypes/cfield.c
@@ -61,7 +61,11 @@ PyCField_FromDesc(PyObject *desc, Py_ssize_t index,
 #define CONT_BITFIELD 2
 #define EXPAND_BITFIELD 3
 
+<<<<<<< HEAD
     self = (CFieldObject *)PyCField_Type.tp_alloc((PyTypeObject *)&PyCField_Type, 0);
+=======
+    self = (CFieldObject *)_PyObject_CallNoArgs((PyObject *)&PyCField_Type);
+>>>>>>> origin/main
     if (self == NULL)
         return NULL;
     dict = PyType_stgdict(desc);

diff --git a/Modules/_ctypes/stgdict.c b/Modules/_ctypes/stgdict.c
@@ -258,7 +258,11 @@ MakeFields(PyObject *type, CFieldObject *descr,
             }
             continue;
         }
+<<<<<<< HEAD
         new_descr = (CFieldObject *)PyCField_Type.tp_alloc((PyTypeObject *)&PyCField_Type, 0);
+=======
+        new_descr = (CFieldObject *)_PyObject_CallNoArgs((PyObject *)&PyCField_Type);
+>>>>>>> origin/main
         if (new_descr == NULL) {
             Py_DECREF(fdescr);
             Py_DECREF(fieldlist);