resolve conflict

python · kumaraditya303 · Dec 21, 2022 · Jul 18, 2019 · Jul 18, 2019 · Jul 18, 2019
commit b1709fdf190bc53f177235eec68b32f026e92e60
diff --git a/Lib/test/test_ctypes/test_struct_fields.py b/Lib/test/test_ctypes/test_struct_fields.py
@@ -48,17 +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
+
+    def test_6(self):
+        class X(Structure):
+            _fields_ = [("x", c_int)]
+        CField = type(X.x)
+        self.assertRaises(TypeError, CField)
 
     def test_gh99275(self):
         class BrokenStructure(Structure):

diff --git a/Misc/NEWS.d/next/Core and Builtins/2019-07-18-12-31-49.bpo-34697.XemM5T.rst b/Misc/NEWS.d/next/Core and Builtins/2019-07-18-12-31-49.bpo-34697.XemM5T.rst
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-12-18-19-07-29.gh-issue-78878.00QOp1.rst b/Misc/NEWS.d/next/Core and Builtins/2022-12-18-19-07-29.gh-issue-78878.00QOp1.rst
@@ -0,0 +1 @@
+Remove the ``PyCField_new`` which user cannot call it directly.
diff --git a/Modules/_ctypes/cfield.c b/Modules/_ctypes/cfield.c
@@ -61,11 +61,7 @@ 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
@@ -257,11 +257,7 @@ 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);
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Remove the ``PyCField_new`` which user cannot call it directly.
Comment thread shihai1991 marked this conversation as resolved. Outdated