Skip to content

gh-107704: Argument Clinic: add support for deprecating keyword use of parameters #107984

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 15 commits into from
Aug 19, 2023
Merged

gh-107704: Argument Clinic: add support for deprecating keyword use of parameters #107984

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
059cd6a
gh-107704: Argument Clinic: add support for deprecating keyword use o…
serhiy-storchaka Aug 8, 2023
b4b9f3c
Silence check-c-globals.py.
serhiy-storchaka Aug 15, 2023
d5e0064
Update the documentation.
serhiy-storchaka Aug 15, 2023
b1300c7
Make constructor's arguments optional, it produces more interesting o…
serhiy-storchaka Aug 15, 2023
ad36c15
Address review comments.
serhiy-storchaka Aug 16, 2023
e271834
Add a test for `* [from ...]` with not inlined parsing code
serhiy-storchaka Aug 17, 2023
e603de7
Consistently use simple function name in error messages.
serhiy-storchaka Aug 17, 2023
3b6f6c4
Apply suggestions from code review
serhiy-storchaka Aug 18, 2023
94d9b34
Merge branch 'main' into clinic-deprecated-keyword
serhiy-storchaka Aug 18, 2023
158c5e3
Rename _testclinic_depr_star.c.h -> _testclinic_depr.c.h
serhiy-storchaka Aug 18, 2023
5c92d36
More efficient checks in case of inlined parsing code.
serhiy-storchaka Aug 18, 2023
6607137
Fix non-inlined parsing in __init__ and __new__.
serhiy-storchaka Aug 18, 2023
9fee851
Fix a case of: inlined parsing + no keyword args + omit some some opt…
serhiy-storchaka Aug 18, 2023
38c9560
Update Tools/c-analyzer/cpython/globals-to-fix.tsv.
serhiy-storchaka Aug 19, 2023
71ea31c
Merge branch 'main' into clinic-deprecated-keyword
serhiy-storchaka Aug 19, 2023
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
Make constructor's arguments optional, it produces more interesting o… 
…utput.
  • Loading branch information
@serhiy-storchaka
serhiy-storchaka committed Aug 15, 2023
commit b1300c73e79ee5e676d5f91d6639a19eb44f063a
16 changes: 8 additions & 8 deletions Lib/test/test_clinic.py
View file
Open in desktop
Comment thread
erlend-aasland marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -3171,39 +3171,39 @@ def test_cloned_func_with_converter_exception_message(self):

def test_depr_star_new(self):
cls = ac_tester.DeprStarNew
cls()
cls(a=None)
self.check_depr_star("'a'", cls, None)
Comment thread
serhiy-storchaka marked this conversation as resolved.
self.assertRaises(TypeError, cls)

def test_depr_star_new_cloned(self):
fn = ac_tester.DeprStarNew(a=None).cloned
fn = ac_tester.DeprStarNew().cloned
fn()
fn(a=None)
self.check_depr_star("'a'", fn, None, name='_testclinic.DeprStarNew.cloned')
self.assertRaises(TypeError, fn)

def test_depr_star_init(self):
cls = ac_tester.DeprStarInit
cls()
cls(a=None)
self.check_depr_star("'a'", cls, None)
self.assertRaises(TypeError, cls)

def test_depr_star_init_cloned(self):
fn = ac_tester.DeprStarInit(a=None).cloned
fn = ac_tester.DeprStarInit().cloned
fn()
fn(a=None)
self.check_depr_star("'a'", fn, None, name='_testclinic.DeprStarInit.cloned')
self.assertRaises(TypeError, fn)

def test_depr_kwd_new(self):
cls = ac_tester.DeprKwdNew
cls()
cls(None)
self.check_depr_kwd("'a'", cls, a=None)
self.assertRaises(TypeError, cls)

def test_depr_kwd_init(self):
cls = ac_tester.DeprKwdInit
cls()
cls(None)
self.check_depr_kwd("'a'", cls, a=None)
self.assertRaises(TypeError, cls)

def test_depr_star_pos0_len1(self):
fn = ac_tester.depr_star_pos0_len1
Expand Down
16 changes: 8 additions & 8 deletions Modules/_testclinic.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1219,13 +1219,13 @@ class _testclinic.DeprStarNew "PyObject *" "PyObject"
@classmethod
_testclinic.DeprStarNew.__new__ as depr_star_new
* [from 3.14]
a: object
a: object = None
The deprecation message should use the class name instead of __new__.
[clinic start generated code]*/

static PyObject *
depr_star_new_impl(PyTypeObject *type, PyObject *a)
/*[clinic end generated code: output=bdbb36244f90cf46 input=f4ae7dafbc23c378]*/
/*[clinic end generated code: output=bdbb36244f90cf46 input=fdd640db964b4dc1]*/
{
return type->tp_alloc(type, 0);
}
Expand Down Expand Up @@ -1260,13 +1260,13 @@ static PyTypeObject DeprStarNew = {
class _testclinic.DeprStarInit "PyObject *" "PyObject"
_testclinic.DeprStarInit.__init__ as depr_star_init
* [from 3.14]
a: object
a: object = None
The deprecation message should use the class name instead of __init__.
[clinic start generated code]*/

static int
depr_star_init_impl(PyObject *self, PyObject *a)
/*[clinic end generated code: output=8d27b43c286d3ecc input=659ebc748d87fa86]*/
/*[clinic end generated code: output=8d27b43c286d3ecc input=5575b77229d5e2be]*/
{
return 0;
}
Expand Down Expand Up @@ -1302,14 +1302,14 @@ static PyTypeObject DeprStarInit = {
class _testclinic.DeprKwdNew "PyObject *" "PyObject"
@classmethod
_testclinic.DeprKwdNew.__new__ as depr_kwd_new
a: object
a: object = None
/ [from 3.14]
The deprecation message should use the class name instead of __new__.
[clinic start generated code]*/

static PyObject *
depr_kwd_new_impl(PyTypeObject *type, PyObject *a)
/*[clinic end generated code: output=618d07afc5616149 input=831cfc26b33703a6]*/
/*[clinic end generated code: output=618d07afc5616149 input=6c7d13c471013c10]*/
{
return type->tp_alloc(type, 0);
}
Expand All @@ -1326,14 +1326,14 @@ static PyTypeObject DeprKwdNew = {
/*[clinic input]
class _testclinic.DeprKwdInit "PyObject *" "PyObject"
_testclinic.DeprKwdInit.__init__ as depr_kwd_init
a: object
a: object = None
/ [from 3.14]
The deprecation message should use the class name instead of __init__.
[clinic start generated code]*/

static int
depr_kwd_init_impl(PyObject *self, PyObject *a)
/*[clinic end generated code: output=6e02eb724a85d840 input=2e85cfe2845593f6]*/
/*[clinic end generated code: output=6e02eb724a85d840 input=b9bf3c20f012d539]*/
{
return 0;
}
Expand Down
78 changes: 57 additions & 21 deletions Modules/clinic/_testclinic_depr_star.c.h
View file
Open in desktop
Comment thread
erlend-aasland marked this conversation as resolved.

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