bpo-46417: Add missing types of _PyTypes_InitTypes() (GH-30749) · python/cpython@a1bf329 · GitHub

python / cpython Public

• Notifications You must be signed in to change notification settings
• Fork 35.3k
• Star 75k

• Code
• Issues 5k+
• Pull requests 2.6k
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit a1bf329

Browse filesBrowse the repository at this point in the historyBrowse files

vstinner

authored

bpo-46417: Add missing types of _PyTypes_InitTypes() (GH-30749)

Add types removed by mistake by the commit adding _PyTypes_FiniTypes(). Move also PyBool_Type at the end, since it depends on PyLong_Type. PyBytes_Type and PyUnicode_Type no longer depend explicitly on PyBaseObject_Type: it's the default of PyType_Ready().

1 parent fda8886 commit a1bf329
Copy full SHA for a1bf329

3 files changed

+11-3Lines changed: 11 additions & 3 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• Objects
  • bytesobject.c
  • object.c
  • unicodeobject.c

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎Objects/bytesobject.c‎

Copy file name to clipboardExpand all lines: Objects/bytesobject.c

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -2904,7 +2904,7 @@ PyTypeObject PyBytes_Type = {
2904	2904	bytes_methods, /* tp_methods */
2905	2905	0, /* tp_members */
2906	2906	0, /* tp_getset */
2907		- &PyBaseObject_Type, /* tp_base */
	2907	+ 0, /* tp_base */
2908	2908	0, /* tp_dict */
2909	2909	0, /* tp_descr_get */
2910	2910	0, /* tp_descr_set */

Collapse file

‎Objects/object.c‎

Copy file name to clipboardExpand all lines: Objects/object.c

+9-1Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -1841,9 +1841,10 @@ _PyTypes_InitState(PyInterpreterState *interp)
1841	1841	static PyTypeObject* static_types[] = {
1842	1842	// base types
1843	1843	&PyAsyncGen_Type,
1844		- &PyBool_Type,
1845	1844	&PyByteArrayIter_Type,
1846	1845	&PyByteArray_Type,
	1846	+ &PyBytesIter_Type,
	1847	+ &PyBytes_Type,
1847	1848	&PyCFunction_Type,
1848	1849	&PyCallIter_Type,
1849	1850	&PyCapsule_Type,
@@ -1866,6 +1867,7 @@ static PyTypeObject* static_types[] = {
1866	1867	&PyDict_Type,
1867	1868	&PyEllipsis_Type,
1868	1869	&PyEnum_Type,
	1870	+ &PyFloat_Type,
1869	1871	&PyFrame_Type,
1870	1872	&PyFrozenSet_Type,
1871	1873	&PyFunction_Type,
@@ -1876,6 +1878,7 @@ static PyTypeObject* static_types[] = {
1876	1878	&PyListRevIter_Type,
1877	1879	&PyList_Type,
1878	1880	&PyLongRangeIter_Type,
	1881	+ &PyLong_Type,
1879	1882	&PyMemberDescr_Type,
1880	1883	&PyMemoryView_Type,
1881	1884	&PyMethodDescr_Type,
@@ -1897,6 +1900,10 @@ static PyTypeObject* static_types[] = {
1897	1900	&PyStdPrinter_Type,
1898	1901	&PySuper_Type,
1899	1902	&PyTraceBack_Type,
	1903	+ &PyTupleIter_Type,
	1904	+ &PyTuple_Type,
	1905	+ &PyUnicodeIter_Type,
	1906	+ &PyUnicode_Type,
1900	1907	&PyWrapperDescr_Type,
1901	1908	&Py_GenericAliasType,
1902	1909	&_PyAnextAwaitable_Type,
@@ -1917,6 +1924,7 @@ static PyTypeObject* static_types[] = {
1917	1924
1918	1925	// subclasses: _PyTypes_FiniTypes() deallocates them before their base
1919	1926	// class
	1927	+ &PyBool_Type, // base=&PyLong_Type
1920	1928	&PyCMethod_Type, // base=&PyCFunction_Type
1921	1929	&PyODictItems_Type, // base=&PyDictItems_Type
1922	1930	&PyODictKeys_Type, // base=&PyDictKeys_Type

Collapse file

‎Objects/unicodeobject.c‎

Copy file name to clipboardExpand all lines: Objects/unicodeobject.c

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -15511,7 +15511,7 @@ PyTypeObject PyUnicode_Type = {
15511	15511	unicode_methods, /* tp_methods */
15512	15512	0, /* tp_members */
15513	15513	0, /* tp_getset */
15514		- &PyBaseObject_Type, /* tp_base */
	15514	+ 0, /* tp_base */
15515	15515	0, /* tp_dict */
15516	15516	0, /* tp_descr_get */
15517	15517	0, /* tp_descr_set */

0 commit comments

Comments

0 (0)