Skip to content

Commit

Permalink
pythongh-107609: Fix duplicate module check in Argument Clinic (pytho…
Browse files Browse the repository at this point in the history
…n#107610)

Also remove duplicate module def from _testcapi.
  • Loading branch information
erlend-aasland committed Aug 4, 2023
1 parent e52e87c commit a443c31
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 3 deletions.
10 changes: 10 additions & 0 deletions Lib/test/test_clinic.py
Original file line number Diff line number Diff line change
Expand Up @@ -416,6 +416,16 @@ def __init__(self):
"""
self.expect_failure(block, err, lineno=8)

def test_module_already_got_one(self):
err = "Already defined module 'm'!"
block = """
/*[clinic input]
module m
module m
[clinic start generated code]*/
"""
self.expect_failure(block, err, lineno=3)


class ClinicGroupPermuterTest(TestCase):
def _test(self, l, m, r, output):
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Fix duplicate module check in Argument Clinic. Previously, a duplicate
definition would incorrectly be silently accepted. Patch by Erlend E.
Aasland.
3 changes: 1 addition & 2 deletions Modules/_testcapi/vectorcall.c
Original file line number Diff line number Diff line change
Expand Up @@ -155,10 +155,9 @@ VectorCallClass_vectorcall(PyObject *callable,
}

/*[clinic input]
module _testcapi
class _testcapi.VectorCallClass "PyObject *" "&PyType_Type"
[clinic start generated code]*/
/*[clinic end generated code: output=da39a3ee5e6b4b0d input=8423a8e919f2f0df]*/
/*[clinic end generated code: output=da39a3ee5e6b4b0d input=95c63c1a47f9a995]*/

/*[clinic input]
_testcapi.VectorCallClass.set_vectorcall
Expand Down
2 changes: 1 addition & 1 deletion Tools/clinic/clinic.py
Original file line number Diff line number Diff line change
Expand Up @@ -4472,7 +4472,7 @@ def directive_module(self, name: str) -> None:
if cls:
fail("Can't nest a module inside a class!")

if name in module.classes:
if name in module.modules:
fail("Already defined module " + repr(name) + "!")

m = Module(name, module)
Expand Down

0 comments on commit a443c31

Please sign in to comment.