python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-01-27 01:34:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8165 from radarhere/imagedraw2_error

Browse Source
This commit is contained in:
Hugo van Kemenade 2024-06-24 03:59:24 -06:00 committed by GitHub
commit ad4c23bddd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Tests/test_imagedraw2.py
View File

@ -57,6 +57,14 @@ def test_sanity() -> None:
draw2.line(list(range(10)), pen) draw2.line(list(range(10)), pen)
def test_mode() -> None:
draw = ImageDraw2.Draw("L", (1, 1))
assert draw.image.mode == "L"
with pytest.raises(ValueError):
ImageDraw2.Draw("L")
@pytest.mark.parametrize("bbox", BBOX) @pytest.mark.parametrize("bbox", BBOX)
def test_ellipse(bbox: Coords) -> None: def test_ellipse(bbox: Coords) -> None:
# Arrange # Arrange

12
src/PIL/ImageDraw2.py
View File

@ -56,8 +56,16 @@ class Draw:
(Experimental) WCK-style drawing interface (Experimental) WCK-style drawing interface
""" """
def __init__(self, image, size=None, color=None): def __init__(
if not hasattr(image, "im"): self,
image: Image.Image | str,
size: tuple[int, int] | list[int] | None = None,
color: float | tuple[float, ...] | str | None = None,
) -> None:
if isinstance(image, str):
if size is None:
msg = "If image argument is mode string, size must be a list or tuple"
raise ValueError(msg)
image = Image.new(image, size, color) image = Image.new(image, size, color)
self.draw = ImageDraw.Draw(image) self.draw = ImageDraw.Draw(image)
self.image = image self.image = image