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

Removed __future__ import from fuzz_font.py and fuzz_pillow.py #7649

Merged
merged 1 commit into from
Dec 29, 2023

Conversation

radarhere
Copy link
Member

@radarhere radarhere commented Dec 29, 2023

Helps #2625.

https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=65341 is still open, complaining that from __future__ imports must occur at the beginning of the file, despite #7637 moving the imports.

I asked about this at google/oss-fuzz#11415, and was told that oss-fuzz prepends code to the files.

I think the solution here is to just remove from __future__ import annotations from fuzz_font.py and fuzz_pillow.py. I've tested it in my oss-fuzz fork, and it fails without this, but passes with.

@hugovk
Copy link
Member

hugovk commented Dec 29, 2023

I think the short/medium term is to remove them.

A better fix would be if they inserted after any from __future__ import ... statements. We, they or others might want to type those files in the future.

But then these are test files so it's not so important to type them, there's not much in these files, and if we did type we could use non-future stuff.

Thanks for the following up!

@hugovk hugovk merged commit 554598d into python-pillow:main Dec 29, 2023
56 checks passed
@radarhere radarhere deleted the fuzz branch December 29, 2023 12:07
@radarhere radarhere changed the title Removed __future__ import from fuzz_font.py and fuzz_pillow.py Removed __future__ import from fuzz_font.py and fuzz_pillow.py Dec 29, 2023
@radarhere
Copy link
Member Author

This worked. https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=65341 is now closed

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

2 participants