Skip to content

gh-142579: Remove the self converter hack in winreg.c #142580

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
encukou merged 1 commit into from
Dec 11, 2025
+8 −25
Merged

gh-142579: Remove the self converter hack in winreg.c #142580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 3 additions & 9 deletions PC/clinic/winreg.c.h
View file
Open in desktop

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

21 changes: 5 additions & 16 deletions PC/winreg.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,19 +264,8 @@ class HKEY_return_converter(CReturnConverter):
self.err_occurred_if_null_pointer("_return_value", data)
data.return_conversion.append(
'return_value = PyHKEY_FromHKEY(_PyModule_GetState(module), _return_value);\n')

# HACK: this only works for PyHKEYObjects, nothing else.
# Should this be generalized and enshrined in clinic.py,
# destroy this converter with prejudice.
class self_return_converter(CReturnConverter):
type = 'PyHKEYObject *'

def render(self, function, data):
self.declare(data)
data.return_conversion.append(
'return_value = (PyObject *)_return_value;\n')
[python start generated code]*/
/*[python end generated code: output=da39a3ee5e6b4b0d input=4979f33998ffb6f8]*/
/*[python end generated code: output=da39a3ee5e6b4b0d input=b34c8217647f5fef]*/

#include "clinic/winreg.c.h"

Expand Down Expand Up @@ -333,14 +322,14 @@ winreg_HKEYType_Detach_impl(PyHKEYObject *self)
}

/*[clinic input]
winreg.HKEYType.__enter__ -> self
winreg.HKEYType.__enter__
[clinic start generated code]*/

static PyHKEYObject *
static PyObject *
winreg_HKEYType___enter___impl(PyHKEYObject *self)
/*[clinic end generated code: output=52c34986dab28990 input=c40fab1f0690a8e2]*/
/*[clinic end generated code: output=70ec10933068a08c input=85f6abf60774c88c]*/
{
return (PyHKEYObject*)Py_XNewRef(self);
return Py_XNewRef(self);
}


Expand Down
Loading