Skip to content

gh-112069: Adapt set/frozenset methods to Argument Clinic #115112

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
erlend-aasland merged 15 commits into from
Feb 8, 2024
Merged

gh-112069: Adapt set/frozenset methods to Argument Clinic #115112

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
7deef19
Start converting set methods to AC
tomasr8 Jan 17, 2024
8159ef3
Convert all `METH_VARARGS` methods
tomasr8 Feb 6, 2024
50a9361
Add news entry
tomasr8 Feb 6, 2024
fd39e1e
Add missing @coexist
tomasr8 Feb 6, 2024
368cb27
Update news entry
tomasr8 Feb 7, 2024
fdce363
Rename default self parameter
tomasr8 Feb 8, 2024
7c8c981
Rename default self parameter part 2
tomasr8 Feb 8, 2024
4d7c7b9
Rename parameter
tomasr8 Feb 8, 2024
0bec7b4
Keep original parameter names
tomasr8 Feb 8, 2024
a4980de
Update indentation
tomasr8 Feb 8, 2024
de2ee5c
Update news entry
tomasr8 Feb 8, 2024
41512ef
Remove extra newlines
tomasr8 Feb 8, 2024
d965236
Fix tests
tomasr8 Feb 8, 2024
d10abef
Add forgotten docstring
tomasr8 Feb 8, 2024
9620fe8
Update clinic
tomasr8 Feb 8, 2024
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
Fix tests
  • Loading branch information
@tomasr8
tomasr8 committed Feb 8, 2024
commit d9652363ca06223afa73544961c3c3ced544385c
10 changes: 5 additions & 5 deletions Objects/clinic/setobject.c.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions Objects/setobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1970,7 +1970,7 @@ set_richcompare(PySetObject *v, PyObject *w, int op)
/*[clinic input]
set.add
so: setobject
key: object
object as key: object
/

Add an element to a set.
Expand All @@ -1980,7 +1980,7 @@ This has no effect if the element is already present.

static PyObject *
set_add(PySetObject *so, PyObject *key)
/*[clinic end generated code: output=cd9c2d5c2069c2ba input=fc19e5024a02a819]*/
/*[clinic end generated code: output=cd9c2d5c2069c2ba input=96f1efe029e47972]*/
{
if (set_add_key(so, key))
return NULL;
Expand Down Expand Up @@ -2011,15 +2011,15 @@ set_contains(PySetObject *so, PyObject *key)
@coexist
set.__contains__
so: setobject
key: object
object as key: object
/

x.__contains__(y) <==> y in x.
[clinic start generated code]*/

static PyObject *
set___contains__(PySetObject *so, PyObject *key)
/*[clinic end generated code: output=b5948bc5c590d3ca input=95c79b822b6e6823]*/
/*[clinic end generated code: output=b5948bc5c590d3ca input=cf4c72db704e4cf0]*/
{
long result;

Expand All @@ -2032,7 +2032,7 @@ set___contains__(PySetObject *so, PyObject *key)
/*[clinic input]
set.remove
so: setobject
key: object
object as key: object
/

Remove an element from a set; it must be a member.
Expand All @@ -2042,7 +2042,7 @@ If the element is not a member, raise a KeyError.

static PyObject *
set_remove(PySetObject *so, PyObject *key)
/*[clinic end generated code: output=08ae496d0cd2b8c1 input=a792bc2b76d2d98d]*/
/*[clinic end generated code: output=08ae496d0cd2b8c1 input=10132515dfe8ebd7]*/
{
PyObject *tmpkey;
int rv;
Expand Down Expand Up @@ -2071,7 +2071,7 @@ set_remove(PySetObject *so, PyObject *key)
/*[clinic input]
set.discard
so: setobject
key: object
object as key: object
/

Remove an element from a set if it is a member.
Expand All @@ -2082,7 +2082,7 @@ an exception when an element is missing from the set.

static PyObject *
set_discard(PySetObject *so, PyObject *key)
/*[clinic end generated code: output=9181b60d7bb7d480 input=e05529cea3b4b295]*/
/*[clinic end generated code: output=9181b60d7bb7d480 input=82a689eba94d5ad9]*/
{
PyObject *tmpkey;
int rv;
Expand Down