Skip to content
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.

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

gh-101819: Remove _PyWindowsConsoleIO_Type from the Windows DLL #101904

Merged
merged 4 commits into from Feb 15, 2023

Conversation

erlend-aasland
Copy link
Contributor

@erlend-aasland erlend-aasland commented Feb 14, 2023

Automerge-Triggered-By: GH:erlend-aasland

@erlend-aasland
Copy link
Contributor Author

Does this work for you, @zooba? Re. #101819 (comment)

@zooba
Copy link
Member

zooba commented Feb 14, 2023

Can you remove the Check macro entirely? It's got to go if we're supporting multiple instances of the module, so may as well just go now.

I'd kinda like to see a few more tstate parameters being passed around, but I guess if the lower level APIs don't take them then there's nowhere to pass them 🤷‍♂️

@erlend-aasland
Copy link
Contributor Author

Can you remove the Check macro entirely? It's got to go if we're supporting multiple instances of the module, so may as well just go now.

The one in PC/_testconsole.c, Python/pylifecycle.c, or both? I assume the assert in Modules/_io/winconsoleio.c should stay.

@zooba
Copy link
Member

zooba commented Feb 14, 2023

I was thinking the definition in _iomodule.h and anywhere it's used, but I see now that's fully internal anyway.

Provided we're not changing any supported public API, it's fine.

@erlend-aasland
Copy link
Contributor Author

Provided we're not changing any supported public API, it's fine.

AFAICS, _iomodule.h is not included in Python.h, so we should be fine.

@erlend-aasland
Copy link
Contributor Author

Perhaps we should wait for #101919 to land, before merging this 😄 cc. @ericsnowcurrently

@ericsnowcurrently
Copy link
Member

Don't worry about waiting for that PR to merge. I don't think it conflicts. Regardless, I don't mind fixing my branch if needed.

Modules/_io/winconsoleio.c Outdated Show resolved Hide resolved
Co-authored-by: Kumar Aditya <59607654+kumaraditya303@users.noreply.github.com>
@miss-islington
Copy link
Contributor

Status check is done, and it's a success ✅.

@miss-islington miss-islington merged commit eb0c485 into python:main Feb 15, 2023
@erlend-aasland erlend-aasland deleted the winconsoletype branch February 15, 2023 13:22
@erlend-aasland
Copy link
Contributor Author

Thanks for the reviews; highly appreciated.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants