Skip to content

Commit

Permalink
Merge pull request #8755 from hugovk/rm-_wedge
Browse files Browse the repository at this point in the history
Remove debug `Image._wedge`
  • Loading branch information
radarhere authored Feb 15, 2025
2 parents 397e6f2 + 126026e commit f8566b9
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 31 deletions.
9 changes: 3 additions & 6 deletions Tests/test_file_gif.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@
# sample gif stream
TEST_GIF = "Tests/images/hopper.gif"

with open(TEST_GIF, "rb") as f:
data = f.read()


def test_sanity() -> None:
with Image.open(TEST_GIF) as im:
Expand All @@ -37,12 +34,12 @@ def test_sanity() -> None:

@pytest.mark.skipif(is_pypy(), reason="Requires CPython")
def test_unclosed_file() -> None:
def open() -> None:
def open_test_image() -> None:
im = Image.open(TEST_GIF)
im.load()

with pytest.warns(ResourceWarning):
open()
open_test_image()


def test_closed_file() -> None:
Expand Down Expand Up @@ -1348,7 +1345,7 @@ def test_save_I(tmp_path: Path) -> None:
def test_getdata(monkeypatch: pytest.MonkeyPatch) -> None:
# Test getheader/getdata against legacy values.
# Create a 'P' image with holes in the palette.
im = Image._wedge().resize((16, 16), Image.Resampling.NEAREST)
im = Image.linear_gradient(mode="L").resize((16, 16), Image.Resampling.NEAREST)
im.putpalette(ImagePalette.ImagePalette("RGB"))
im.info = {"background": 0}

Expand Down
28 changes: 13 additions & 15 deletions Tests/test_format_hsv.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,28 +22,26 @@ def test_sanity() -> None:
Image.new("HSV", (100, 100))


def wedge() -> Image.Image:
w = Image._wedge()
w90 = w.rotate(90)
def linear_gradient() -> Image.Image:
im = Image.linear_gradient(mode="L")
im90 = im.rotate(90)

(px, h) = w.size
(px, h) = im.size

r = Image.new("L", (px * 3, h))
g = r.copy()
b = r.copy()

r.paste(w, (0, 0))
r.paste(w90, (px, 0))
r.paste(im, (0, 0))
r.paste(im90, (px, 0))

g.paste(w90, (0, 0))
g.paste(w, (2 * px, 0))
g.paste(im90, (0, 0))
g.paste(im, (2 * px, 0))

b.paste(w, (px, 0))
b.paste(w90, (2 * px, 0))
b.paste(im, (px, 0))
b.paste(im90, (2 * px, 0))

img = Image.merge("RGB", (r, g, b))

return img
return Image.merge("RGB", (r, g, b))


def to_xxx_colorsys(
Expand Down Expand Up @@ -79,8 +77,8 @@ def to_rgb_colorsys(im: Image.Image) -> Image.Image:
return to_xxx_colorsys(im, colorsys.hsv_to_rgb, "RGB")


def test_wedge() -> None:
src = wedge().resize((3 * 32, 32), Image.Resampling.BILINEAR)
def test_linear_gradient() -> None:
src = linear_gradient().resize((3 * 32, 32), Image.Resampling.BILINEAR)
im = src.convert("HSV")
comparable = to_hsv_colorsys(src)

Expand Down
9 changes: 0 additions & 9 deletions src/PIL/Image.py
Original file line number Diff line number Diff line change
Expand Up @@ -2996,15 +2996,6 @@ def transform(
# --------------------------------------------------------------------
# Factories

#
# Debugging


def _wedge() -> Image:
"""Create grayscale wedge (for debugging only)"""

return Image()._new(core.wedge("L"))


def _check_size(size: Any) -> None:
"""
Expand Down
1 change: 0 additions & 1 deletion src/_imaging.c
Original file line number Diff line number Diff line change
Expand Up @@ -4256,7 +4256,6 @@ static PyMethodDef functions[] = {
{"effect_noise", (PyCFunction)_effect_noise, METH_VARARGS},
{"linear_gradient", (PyCFunction)_linear_gradient, METH_VARARGS},
{"radial_gradient", (PyCFunction)_radial_gradient, METH_VARARGS},
{"wedge", (PyCFunction)_linear_gradient, METH_VARARGS}, /* Compatibility */

/* Drawing support stuff */
{"font", (PyCFunction)_font_new, METH_VARARGS},
Expand Down

0 comments on commit f8566b9

Please sign in to comment.