8000 gh-108494: Argument Clinic: fix support of limited C API · python/cpython@952e38c · GitHub
[go: up one dir, main page]
Skip to content

Commit 952e38c

Browse files
serhiy-storchakaserhiy-storchaka
committed
gh-108494: Argument Clinic: fix support of limited C API
1 parent e407cea commit 952e38c

File tree

10 files changed

+155
-122
lines changed

10 files changed

+155
-122
lines changed

‎Lib/test/test_call.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ def test_varargs3(self):
6565
self.assertRaisesRegex(TypeError, msg, int.from_bytes, b'a', 'little', False)
6666

6767
def test_varargs1min(self):
68-
msg = r"get expected at least 1 argument, got 0"
68+
msg = (r"get\(\) takes at least 1 argument \(0 given\)|"
69+
r"get expected at least 1 argument, got 0")
6970
self.assertRaisesRegex(TypeError, msg, {}.get)
7071

7172
msg = r"expected 1 argument, got 0"
@@ -76,11 +77,13 @@ def test_varargs2min(self):
7677
self.assertRaisesRegex(TypeError, msg, getattr)
7778

7879
def test_varargs1max(self):
79-
msg = r"input expected at most 1 argument, got 2"
80+
msg = (r"input\(\) takes at most 1 argument \(2 given\)|"
81+
r"input expected at most 1 argument, got 2")
8082
self.assertRaisesRegex(TypeError, msg, input, 1, 2)
8183

8284
def test_varargs2max(self):
83-
msg = r"get expected at most 2 arguments, got 3"
85+
msg = (r"get\(\) takes at most 2 arguments \(3 given\)|"
86+
r"get expected at most 2 arguments, got 3")
8487
self.assertRaisesRegex(TypeError, msg, {}.get, 1, 2, 3)
8588

8689
def test_varargs1_kw(self):
@@ -96,7 +99,7 @@ def test_varargs3_kw(self):
9699
self.assertRaisesRegex(TypeError, msg, bool, x=2)
97100

98101
def test_varargs4_kw(self):
99-
msg = r"^list[.]index\(\) takes no keyword arguments$"
102+
msg = r"^(list[.])?index\(\) takes no keyword arguments$"
100103
self.assertRaisesRegex(TypeError, msg, [].index, x=2)
101104

102105
def test_varargs5_kw(self):

‎Lib/test/test_enum.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2799,11 +2799,13 @@ class SecondFailedStrEnum(CustomStrEnum):
27992799
class ThirdFailedStrEnum(CustomStrEnum):
28002800
one = '1'
28012801
two = 2 # this will become '2'
2802-
with self.assertRaisesRegex(TypeError, '.encoding. must be str, not '):
2802+
with self.assertRaisesRegex(TypeError,
2803+
r"argument (2|'encoding') must be str, not "):
28032804
class ThirdFailedStrEnum(CustomStrEnum):
28042805
one = '1'
28052806
two = b'2', sys.getdefaultencoding
2806-
with self.assertRaisesRegex(TypeError, '.errors. must be str, not '):
2807+
with self.assertRaisesRegex(TypeError,
2808+
r"argument (3|'errors') must be str, not "):
28072809
class ThirdFailedStrEnum(CustomStrEnum):
28082810
one = '1'
28092811
two = b'2', 'ascii', 9

‎Lib/test/test_pyexpat.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -281,12 +281,10 @@ def test_legal(self):
281281
expat.ParserCreate(namespace_separator=' ')
282282

283283
def test_illegal(self):
284-
try:
284+
with self.assertRaisesRegex(TypeError,
285+
r"ParserCreate\(\) argument (2|'namespace_separator') "
286+
r"must be str or None, not int"):
285287
expat.ParserCreate(namespace_separator=42)
286-
self.fail()
287-
except TypeError as e:
288-
self.assertEqual(str(e),
289-
"ParserCreate() argument 'namespace_separator' must be str or None, not int")
290288

291289
try:
292290
expat.ParserCreate(namespace_separator='too long')

‎Modules/_localemodule.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ This software comes with no warranty. Use at your own risk.
1111

1212
#include "Python.h"
1313
#include "pycore_fileutils.h"
14+
#include "pycore_pymem.h" // _PyMem_Strdup
1415

1516
#include <stdio.h>
1617
#include <locale.h>

‎Modules/_sqlite/module.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ load_functools_lru_cache(PyObject *module)
244244
static PyMethodDef module_methods[] = {
245245
PYSQLITE_ADAPT_METHODDEF
246246
PYSQLITE_COMPLETE_STATEMENT_METHODDEF
247-
PYSQLITE_CONNECT_METHODDEF
247+
{"connect", _PyCFunction_CAST(pysqlite_connect), METH_FASTCALL|METH_KEYWORDS, pysqlite_connect__doc__},
248248
PYSQLITE_ENABLE_CALLBACK_TRACE_METHODDEF
249249
PYSQLITE_REGISTER_ADAPTER_METHODDEF
250250
PYSQLITE_REGISTER_CONVERTER_METHODDEF

‎Modules/_tracemalloc.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include "Python.h"
2+
#include "pycore_tracemalloc.h" // _PyTraceMalloc_IsTracing
23

34
#include "clinic/_tracemalloc.c.h"
45

‎Modules/clinic/_testclinic_limited.c.h

Lines changed: 2 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Python/Python-tokenize.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@ _tokenizer.tokenizeriter.__new__ as tokenizeriter_new
4040
readline: object
4141
/
4242
*
43-
extra_tokens: bool
43+
extra_tokens: bool = False
4444
encoding: str(c_default="NULL") = 'utf-8'
4545
[clinic start generated code]*/
4646

4747
static PyObject *
4848
tokenizeriter_new_impl(PyTypeObject *type, PyObject *readline,
4949
int extra_tokens, const char *encoding)
50-
/*[clinic end generated code: output=7501a1211683ce16 input=f7dddf8a613ae8bd]*/
50+
/*[clinic end generated code: output=7501a1211683ce16 input=51c478867094fe04]*/
5151
{
5252
tokenizeriterobject *self = (tokenizeriterobject *)type->tp_alloc(type, 0);
5353
if (self == NULL) {

‎Python/clinic/Python-tokenize.c.h

Lines changed: 13 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
0