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.

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

[24.0] Fix conditional Image imports #17899

Merged
merged 1 commit into from
Apr 4, 2024
Merged

[24.0] Fix conditional Image imports #17899

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
2 changes: 1 addition & 1 deletion lib/galaxy/tool_util/verify/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
try:
from PIL import Image
except ImportError:
pass
Image = None # type: ignore[assignment]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I changed this to pass on purpose since in the rest of this file we are not handling the case where Image is None (as we instead do in lib/galaxy/util/image_util.py), so a NameError: name 'Image' is not defined exception is better than a AttributeError: 'NoneType' object has no attribute 'open' one.

No need to change it back anyway, and thanks for the other fix (backport of #17749 ).


from galaxy.tool_util.parser.util import (
DEFAULT_DELTA,
Expand Down
2 changes: 1 addition & 1 deletion lib/galaxy/util/image_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
try:
from PIL import Image
except ImportError:
PIL = None
Image = None # type: ignore[assignment]

log = logging.getLogger(__name__)

Expand Down
Loading