Skip to content
Merged
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'upstream/main' into gh-113318-getset-re…
…work

# Conflicts:
#	Modules/_sqlite/cursor.c
#	Modules/clinic/_ssl.c.h
#	Tools/clinic/libclinic/clanguage.py
#	Tools/clinic/libclinic/parse_args.py
  • Loading branch information
serhiy-storchaka committed Aug 23, 2026
commit 10a10ddbc0ac61482d5659b12af9d9c6116df5cd
2 changes: 1 addition & 1 deletion Modules/clinic/_ssl.c.h

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

4 changes: 2 additions & 2 deletions Tools/clinic/libclinic/clanguage.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
from libclinic.codegen import CRenderData, CodeGen
from libclinic.language import Language
from libclinic.function import (
Module, Class, Property, Function, Parameter, ParamTuple,
permute_optional_groups,
Module, Class, Property, Function, Parameter,
group_to_variable_name,
METHOD_INIT,
ACCESSORS, SETTERS)
from libclinic.converters import self_converter
Expand Down
7 changes: 4 additions & 3 deletions Tools/clinic/libclinic/parse_args.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@
import libclinic
from libclinic import fail, warn, unspecified, Sentinels
from libclinic.function import (
Function, Parameter,
GETTER, SETTER, SETTER_AND_DELETER, ACCESSORS, SETTERS,
METHOD_NEW)
Function, Parameter, ParamTuple,
count_required, group_to_variable_name, permute_optional_groups,
GETTER, SETTER, SETTER_AND_DELETER, METHOD_NEW,
ACCESSORS, SETTERS)
from libclinic.converter import CConverter
from libclinic.converters import (
defining_class_converter, object_converter, self_converter)
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.