Skip to content

ImageMath: Only compute ops dict when needed #7718

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

Closed
hugovk wants to merge 3 commits into from
Closed

ImageMath: Only compute ops dict when needed #7718

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
69ada99
Only compute ops dict when needed
hugovk Jan 15, 2024
96eb24b
Rewrite as dict comprehension
hugovk Jan 15, 2024
9f75bba
Use lru_cache for Python 3.8 compatibilty
hugovk Jan 15, 2024
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
10 changes: 5 additions & 5 deletions src/PIL/ImageMath.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
from __future__ import annotations

import builtins
from functools import lru_cache
from types import CodeType
from typing import Any

Expand Down Expand Up @@ -224,10 +225,9 @@ def imagemath_convert(self: _Operand, mode: str) -> _Operand:
return _Operand(self.im.convert(mode))


ops = {}
for k, v in list(globals().items()):
if k[:10] == "imagemath_":
ops[k[10:]] = v
@lru_cache
def _get_ops() -> dict[str, Any]:
return {k[10:]: v for k, v in globals().items() if k[:10] == "imagemath_"}


def eval(expression: str, _dict: dict[str, Any] = {}, **kw: Any) -> Any:
Expand All @@ -244,7 +244,7 @@ def eval(expression: str, _dict: dict[str, Any] = {}, **kw: Any) -> Any:
"""

# build execution namespace
args = ops.copy()
args = _get_ops().copy()
for k in list(_dict.keys()) + list(kw.keys()):
if "__" in k or hasattr(builtins, k):
msg = f"'{k}' not allowed"
Expand Down