Do not discard error message if _imagingft fails to import#7047
Merged
hugovk merged 3 commits intopython-pillow:mainfrom Apr 1, 2023
Merged
Do not discard error message if _imagingft fails to import#7047hugovk merged 3 commits intopython-pillow:mainfrom
hugovk merged 3 commits intopython-pillow:mainfrom
Conversation
Member
|
Would you mind sharing more specific details about how to replicate the intentional error you tested with? |
Member
|
I'm trying, but for reasons I don't understand, Pillow still thinks it has access to FreeType 2.12.1. |
Contributor
Author
|
It looks like it downloaded the wheel: https://github.com/radarhere/docker-images/actions/runs/4575672322/jobs/8078793400#step:6:10950 For my tests I cloned my branch in $ docker run -it --rm -v ~/pillow:/pillow fedora:26 bash
...
# cat /root/.bash_history
dnf install -y python37 gcc freetype-devel zlib-devel libjpeg-devel
cd /pillow/
python3.7 -m ensurepip
python3.7 -m pip install -U pip setuptools
python3.7 -m pip install . --no-cache-dir --ignore-installed
python3.7 -c "import PIL.ImageFont; PIL.ImageFont.core.test"
python3.7 -m PIL
history -a |
radarhere
approved these changes
Apr 1, 2023
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Helps #7040
Changes:
_util.DeferredErrorif_imagingftfails to import instead of a custom helper from before the fork (similarly toImageCms, added in Readthedocs #600),ImportErrorbut notModuleNotFoundError), raise a warning inPIL.features,FT_LOAD_COLORwas added in FreeType 2.5, Pillow currently requires FreeType>=2.8 (Remove support for FreeType 2.7 and older #5777)FT_LOAD_TARGET_MONOversion added is undocumented, but has been around since FreeType 2.1.3,#define KEEP_PY_UNICODE, was only used in filepy3.hwhich was removed in Drop support for EOL Python 2.7 #4109I've tested these changes by compiling Pillow in a Fedora 26 Docker container (with FreeType 2.7.1 and no other optional dependencies) with an intentional error in
_imagingft: