Skip to content

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

Merged
miss-islington merged 4 commits into
python:mainfrom
erlend-aasland:winconsoletype
Feb 15, 2023
Merged

gh-101819: Remove _PyWindowsConsoleIO_Type from the Windows DLL#101904
miss-islington merged 4 commits into
python:mainfrom
erlend-aasland:winconsoletype

Conversation

@erlend-aasland

@erlend-aaslanderlend-aasland commented Feb 14, 2023

Copy link
Copy Markdown
Contributor

Automerge-Triggered-By: GH:erlend-aasland

@erlend-aasland

Copy link
Copy Markdown
ContributorAuthor

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

@zooba

Copy link
Copy Markdown
Member

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
Copy Markdown
ContributorAuthor

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
Copy Markdown
Member

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
Copy Markdown
ContributorAuthor

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
Copy Markdown
ContributorAuthor

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

@ericsnowcurrently

Copy link
Copy Markdown
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.

Comment threadModules/_io/_iomodule.h Outdated
@kumaraditya303
kumaraditya303 self-requested a review February 15, 2023 10:36
Comment threadModules/_io/winconsoleio.c Outdated
Co-authored-by: Kumar Aditya <59607654+kumaraditya303@users.noreply.github.com>
@miss-islington

Copy link
Copy Markdown
Contributor

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

@miss-islington
miss-islington merged commit eb0c485 into python:mainFeb 15, 2023
@erlend-aasland
erlend-aasland deleted the winconsoletype branch February 15, 2023 13:22
@erlend-aasland

Copy link
Copy Markdown
ContributorAuthor

Thanks for the reviews; highly appreciated.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@erlend-aasland@zooba@ericsnowcurrently@miss-islington@kumaraditya303@bedevere-bot