X Tutup
Skip to content

gh-112068: C API: Add support of nullable arguments in PyArg_Parse (suffix) #121303

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
serhiy-storchaka merged 14 commits into from
Apr 8, 2025
Merged

gh-112068: C API: Add support of nullable arguments in PyArg_Parse (suffix) #121303

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
389dfd9
gh-112068: C API: Add support of nullable arguments in PyArg_Parse
serhiy-storchaka Apr 12, 2024
19be6b7
Add more tests.
serhiy-storchaka Jul 3, 2024
cd90539
Add more tests.
serhiy-storchaka Jul 3, 2024
75e8c5e
Implement (...)?.
serhiy-storchaka Jul 4, 2024
02e05f6
Improve error message for et? and et#?.
serhiy-storchaka Jul 4, 2024
9261aee
Refactoring.
serhiy-storchaka Jul 4, 2024
36ce78b
Merge branch 'main' into zipimport-namespace-suffix
serhiy-storchaka Jul 4, 2024
83ebf93
Merge branch 'main' into zipimport-namespace-suffix
serhiy-storchaka Nov 8, 2024
2c2ec36
Merge branch 'main' into zipimport-namespace-suffix
serhiy-storchaka Jan 8, 2025
8df697e
Add more examples.
serhiy-storchaka Jan 9, 2025
eba9e41
Merge branch 'main' into zipimport-namespace-suffix
serhiy-storchaka Apr 8, 2025
7c1c335
Fix test for changed error message.
serhiy-storchaka Apr 8, 2025
d30e809
Apply suggestions from code review
serhiy-storchaka Apr 8, 2025
76f506e
Merge branch 'main' into zipimport-namespace-suffix
serhiy-storchaka Apr 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Implement (...)?.
  • Loading branch information
@serhiy-storchaka
serhiy-storchaka committed Jul 4, 2024
commit 75e8c5e4e0309fb8ba0f31931caffaf9f5bc402e
10 changes: 7 additions & 3 deletions Lib/test/test_capi/test_getargs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1401,10 +1401,9 @@ def check(format, arg, expected, got='list'):
check('Y', [], 'bytearray')
check('Y?', [], 'bytearray or None')
check('(OO)', 42, '2-item sequence', 'int')
check('(OO)?', 42, '2-item sequence or None', 'int')
check('(OO)', (1, 2, 3), 'sequence of length 2', '3')

# TODO: Not implemented: (...)?

def test_nullable(self):
parse = _testcapi.parse_tuple_and_keywords

Expand Down Expand Up @@ -1455,6 +1454,12 @@ def check(format, arg, allows_none=False):
check('Y', bytearray(b'bytearray'))
check('O', object, allows_none=True)

check('(OO)', (1, 2))
self.assertEqual(parse((((1, 2), 3),), {}, '((OO)?O)', ['a']), (1, 2, 3))
self.assertEqual(parse(((None, 3),), {}, '((OO)?O)', ['a']), (NULL, NULL, 3))
self.assertEqual(parse((((1, 2), 3),), {}, '((OO)O)', ['a']), (1, 2, 3))
self.assertRaises(TypeError, parse, ((None, 3),), {}, '((OO)O)', ['a'])

parse((None,), {}, 'es?', ['a'])
parse((None,), {}, 'es#?', ['a'])
parse((None,), {}, 'et?', ['a'])
Expand All @@ -1463,7 +1468,6 @@ def check(format, arg, allows_none=False):
parse((None,), {}, 'O&?', ['a'])

# TODO: More tests for es?, es#?, et?, et#?, O!, O&
# TODO: Not implemented: (...)?

@unittest.skipIf(_testinternalcapi is None, 'needs _testinternalcapi')
def test_gh_119213(self):
Expand Down
29 changes: 24 additions & 5 deletions Python/getargs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ static const char *converttuple(PyObject *, const char **, va_list *, int,
int *, char *, size_t, freelist_t *);
static const char *convertsimple(PyObject *, const char **, va_list *, int,
char *, size_t, freelist_t *);
static const char * converterr(int, const char *, PyObject *, char *, size_t);
static Py_ssize_t convertbuffer(PyObject *, const void **p, const char **);
static int getbuffer(PyObject *, Py_buffer *, const char**);

Expand Down Expand Up @@ -467,6 +468,8 @@ converttuple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
int i;
Py_ssize_t len;

assert(*format == '(');
format++;
for (;;) {
int c = *format++;
if (c == '(') {
Expand All @@ -475,8 +478,12 @@ converttuple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
level++;
}
else if (c == ')') {
if (level == 0)
if (level == 0) {
if (*format == '?') {
flags |= FLAG_NULLABLE;
}
break;
}
level--;
}
else if (c == ':' || c == ';' || c == '\0')
Expand All @@ -485,6 +492,17 @@ converttuple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
n++;
}

if (arg == Py_None && (flags & FLAG_NULLABLE)) {
format = *p_format;
const char *msg = skipitem(&format, p_va, flags);
if (msg == NULL) {
*p_format = format;
}
else {
levels[0] = 0;
}
return msg;
}
if (!PySequence_Check(arg) || PyBytes_Check(arg)) {
levels[0] = 0;
PyOS_snprintf(msgbuf, bufsize,
Expand All @@ -505,7 +523,7 @@ converttuple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
}

flags &= ~FLAG_NULLABLE;
format = *p_format;
format = *p_format + 1;
for (i = 0; i < n; i++) {
const char *msg;
PyObject *item;
Expand All @@ -527,6 +545,10 @@ converttuple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
}
}

format++;
if (*format == '?') {
format++;
}
*p_format = format;
return NULL;
}
Expand All @@ -542,11 +564,8 @@ convertitem(PyObject *arg, const char **p_format, va_list *p_va, int flags,
const char *format = *p_format;

if (*format == '(' /* ')' */) {
format++;
msg = converttuple(arg, &format, p_va, flags, levels, msgbuf,
bufsize, freelist);
if (msg == NULL)
format++;
}
else {
msg = convertsimple(arg, &format, p_va, flags,
Expand Down
X Tutup