Skip to content

Commit 1480166

Browse files
committed
Revert "fixup"
This reverts commit 4001c73.
1 parent 4001c73 commit 1480166

File tree

4 files changed

+140
-88
lines changed

4 files changed

+140
-88
lines changed

Modules/_testclinic.c

Lines changed: 39 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1444,24 +1444,26 @@ _testclinic_TestClass_defclass_posonly_varpos_impl(PyObject *self,
14441444

14451445

14461446
/*[clinic input]
1447+
@disable fastcall
14471448
@classmethod
1448-
_testclinic.TestClass.__new__ as varpos_no_fastcall
1449+
_testclinic.TestClass.class_method as varpos_no_fastcall
14491450
14501451
*args: tuple
14511452
14521453
[clinic start generated code]*/
14531454

14541455
static PyObject *
14551456
varpos_no_fastcall_impl(PyTypeObject *type, PyObject *args)
1456-
/*[clinic end generated code: output=04e94f2898bb2dde input=c5d3d30a6589f97f]*/
1457+
/*[clinic end generated code: output=04e94f2898bb2dde input=10c2251e9ac6baf3]*/
14571458
{
14581459
return Py_NewRef(args);
14591460
}
14601461

14611462

14621463
/*[clinic input]
1464+
@disable fastcall
14631465
@classmethod
1464-
_testclinic.TestClass.__new__ as posonly_varpos_no_fastcall
1466+
_testclinic.TestClass.class_method as posonly_varpos_no_fastcall
14651467
14661468
a: object
14671469
b: object
@@ -1473,15 +1475,16 @@ _testclinic.TestClass.__new__ as posonly_varpos_no_fastcall
14731475
static PyObject *
14741476
posonly_varpos_no_fastcall_impl(PyTypeObject *type, PyObject *a, PyObject *b,
14751477
PyObject *args)
1476-
/*[clinic end generated code: output=b0a0425719f69f5a input=10f29f2c2c6bfdc4]*/
1478+
/*[clinic end generated code: output=b0a0425719f69f5a input=f7c75501a787c7af]*/
14771479
{
14781480
return pack_arguments_newref(3, a, b, args);
14791481
}
14801482

14811483

14821484
/*[clinic input]
1485+
@disable fastcall
14831486
@classmethod
1484-
_testclinic.TestClass.__new__ as posonly_req_opt_varpos_no_fastcall
1487+
_testclinic.TestClass.class_method as posonly_req_opt_varpos_no_fastcall
14851488
14861489
a: object
14871490
b: object = False
@@ -1493,15 +1496,16 @@ _testclinic.TestClass.__new__ as posonly_req_opt_varpos_no_fastcall
14931496
static PyObject *
14941497
posonly_req_opt_varpos_no_fastcall_impl(PyTypeObject *type, PyObject *a,
14951498
PyObject *b, PyObject *args)
1496-
/*[clinic end generated code: output=3c44915b1a554e2d input=d319302a8748147c]*/
1499+
/*[clinic end generated code: output=3c44915b1a554e2d input=701bf93e7572e6b3]*/
14971500
{
14981501
return pack_arguments_newref(3, a, b, args);
14991502
}
15001503

15011504

15021505
/*[clinic input]
1506+
@disable fastcall
15031507
@classmethod
1504-
_testclinic.TestClass.__new__ as posonly_poskw_varpos_no_fastcall
1508+
_testclinic.TestClass.class_method as posonly_poskw_varpos_no_fastcall
15051509
15061510
a: object
15071511
/
@@ -1513,15 +1517,16 @@ _testclinic.TestClass.__new__ as posonly_poskw_varpos_no_fastcall
15131517
static PyObject *
15141518
posonly_poskw_varpos_no_fastcall_impl(PyTypeObject *type, PyObject *a,
15151519
PyObject *b, PyObject *args)
1516-
/*[clinic end generated code: output=6ad74bed4bdc7f96 input=1f8c113e749414a3]*/
1520+
/*[clinic end generated code: output=6ad74bed4bdc7f96 input=2bbbc74dc92ba7ba]*/
15171521
{
15181522
return pack_arguments_newref(3, a, b, args);
15191523
}
15201524

15211525

15221526
/*[clinic input]
1527+
@disable fastcall
15231528
@classmethod
1524-
_testclinic.TestClass.__new__ as varpos_array_no_fastcall
1529+
_testclinic.TestClass.class_method as varpos_array_no_fastcall
15251530
15261531
*args: array
15271532
@@ -1530,15 +1535,16 @@ _testclinic.TestClass.__new__ as varpos_array_no_fastcall
15301535
static PyObject *
15311536
varpos_array_no_fastcall_impl(PyTypeObject *type, PyObject * const *args,
15321537
Py_ssize_t args_length)
1533-
/*[clinic end generated code: output=f99d984346c60d42 input=368d8eea6de48c12]*/
1538+
/*[clinic end generated code: output=f99d984346c60d42 input=de625878254ecac0]*/
15341539
{
15351540
return _PyTuple_FromArray(args, args_length);
15361541
}
15371542

15381543

15391544
/*[clinic input]
1545+
@disable fastcall
15401546
@classmethod
1541-
_testclinic.TestClass.__new__ as posonly_varpos_array_no_fastcall
1547+
_testclinic.TestClass.class_method as posonly_varpos_array_no_fastcall
15421548
15431549
a: object
15441550
b: object
@@ -1551,15 +1557,16 @@ static PyObject *
15511557
posonly_varpos_array_no_fastcall_impl(PyTypeObject *type, PyObject *a,
15521558
PyObject *b, PyObject * const *args,
15531559
Py_ssize_t args_length)
1554-
/*[clinic end generated code: output=1eec4da1fb5b5978 input=7330c8d819a23548]*/
1560+
/*[clinic end generated code: output=1eec4da1fb5b5978 input=15adeb514423f485]*/
15551561
{
15561562
return pack_arguments_2pos_varpos(a, b, args, args_length);
15571563
}
15581564

15591565

15601566
/*[clinic input]
1567+
@disable fastcall
15611568
@classmethod
1562-
_testclinic.TestClass.__new__ as posonly_req_opt_varpos_array_no_fastcall
1569+
_testclinic.TestClass.class_method as posonly_req_opt_varpos_array_no_fastcall
15631570
15641571
a: object
15651572
b: object = False
@@ -1573,15 +1580,16 @@ posonly_req_opt_varpos_array_no_fastcall_impl(PyTypeObject *type,
15731580
PyObject *a, PyObject *b,
15741581
PyObject * const *args,
15751582
Py_ssize_t args_length)
1576-
/*[clinic end generated code: output=88041c2176135218 input=7f5fd34ee5f9e0bf]*/
1583+
/*[clinic end generated code: output=88041c2176135218 input=445ff173a49709d5]*/
15771584
{
15781585
return pack_arguments_2pos_varpos(a, b, args, args_length);
15791586
}
15801587

15811588

15821589
/*[clinic input]
1590+
@disable fastcall
15831591
@classmethod
1584-
_testclinic.TestClass.__new__ as posonly_poskw_varpos_array_no_fastcall
1592+
_testclinic.TestClass.class_method as posonly_poskw_varpos_array_no_fastcall
15851593
15861594
a: object
15871595
/
@@ -1595,7 +1603,7 @@ posonly_poskw_varpos_array_no_fastcall_impl(PyTypeObject *type, PyObject *a,
15951603
PyObject *b,
15961604
PyObject * const *args,
15971605
Py_ssize_t args_length)
1598-
/*[clinic end generated code: output=70eda18c3667681e input=2b0fcd7bd9bb865c]*/
1606+
/*[clinic end generated code: output=70eda18c3667681e input=c0ac0f6b990f553c]*/
15991607
{
16001608
return pack_arguments_2pos_varpos(a, b, args, args_length);
16011609
}
@@ -1606,28 +1614,27 @@ static struct PyMethodDef test_class_methods[] = {
16061614
_TESTCLINIC_TESTCLASS_DEFCLASS_VARPOS_METHODDEF
16071615
_TESTCLINIC_TESTCLASS_DEFCLASS_POSONLY_VARPOS_METHODDEF
16081616

1609-
{"varpos_no_fastcall", varpos_no_fastcall,
1610-
METH_VARARGS|METH_CLASS, PyDoc_STR("")},
1611-
{"posonly_varpos_no_fastcall", posonly_varpos_no_fastcall,
1612-
METH_VARARGS|METH_CLASS, PyDoc_STR("")},
1613-
{"posonly_req_opt_varpos_no_fastcall", posonly_req_opt_varpos_no_fastcall,
1614-
METH_VARARGS|METH_CLASS, PyDoc_STR("")},
1615-
{"posonly_poskw_varpos_no_fastcall",
1616-
_PyCFunction_CAST(posonly_poskw_varpos_no_fastcall),
1617-
METH_VARARGS|METH_KEYWORDS|METH_CLASS, PyDoc_STR("")},
1617+
{"varpos_no_fastcall", _PyCFunction_CAST(varpos_no_fastcall),
1618+
METH_VARARGS|METH_CLASS, ""},
1619+
{"posonly_varpos_no_fastcall", _PyCFunction_CAST(posonly_varpos_no_fastcall),
1620+
METH_VARARGS|METH_CLASS, ""},
1621+
{"posonly_req_opt_varpos_no_fastcall", _PyCFunction_CAST(posonly_req_opt_varpos_no_fastcall),
1622+
METH_VARARGS|METH_CLASS, ""},
1623+
{"posonly_poskw_varpos_no_fastcall", _PyCFunction_CAST(posonly_poskw_varpos_no_fastcall),
1624+
METH_VARARGS|METH_KEYWORDS|METH_CLASS, ""},
16181625

16191626
{"varpos_array_no_fastcall",
1620-
varpos_array_no_fastcall,
1621-
METH_VARARGS|METH_CLASS, PyDoc_STR("")},
1627+
_PyCFunction_CAST(varpos_array_no_fastcall),
1628+
METH_VARARGS|METH_KEYWORDS|METH_CLASS, ""},
16221629
{"posonly_varpos_array_no_fastcall",
1623-
posonly_varpos_array_no_fastcall,
1624-
METH_VARARGS|METH_CLASS, PyDoc_STR("")},
1630+
_PyCFunction_CAST(posonly_varpos_array_no_fastcall),
1631+
METH_VARARGS|METH_KEYWORDS|METH_CLASS, ""},
16251632
{"posonly_req_opt_varpos_array_no_fastcall",
1626-
posonly_req_opt_varpos_array_no_fastcall,
1627-
METH_VARARGS|METH_CLASS, PyDoc_STR("")},
1633+
_PyCFunction_CAST(posonly_req_opt_varpos_array_no_fastcall),
1634+
METH_VARARGS|METH_KEYWORDS|METH_CLASS, ""},
16281635
{"posonly_poskw_varpos_array_no_fastcall",
16291636
_PyCFunction_CAST(posonly_poskw_varpos_array_no_fastcall),
1630-
METH_VARARGS|METH_KEYWORDS|METH_CLASS, PyDoc_STR("")},
1637+
METH_VARARGS|METH_KEYWORDS|METH_CLASS, ""},
16311638

16321639
{NULL, NULL}
16331640
};

0 commit comments

Comments
 (0)