python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-08-22 05:04:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

Added context managers

Browse Source
This commit is contained in:
Andrew Murray 2021-02-18 00:00:09 +11:00
parent 53318fbfc1
commit 0316a9e9fe
3 changed files with 60 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Tests/test_file_jpeg.py
View File

@ -577,7 +577,8 @@ class TestFileJpeg:
def test_load_djpeg(self): def test_load_djpeg(self):
with Image.open(TEST_FILE) as img: with Image.open(TEST_FILE) as img:
img.load_djpeg() img.load_djpeg()
assert_image_similar(img, Image.open(TEST_FILE), 5) with Image.open(TEST_FILE) as expected:
assert_image_similar(img, expected, 5)
@pytest.mark.skipif(not cjpeg_available(), reason="cjpeg not available") @pytest.mark.skipif(not cjpeg_available(), reason="cjpeg not available")
def test_save_cjpeg(self, tmp_path): def test_save_cjpeg(self, tmp_path):
@ -585,7 +586,8 @@ class TestFileJpeg:
tempfile = str(tmp_path / "temp.jpg") tempfile = str(tmp_path / "temp.jpg")
JpegImagePlugin._save_cjpeg(img, 0, tempfile) JpegImagePlugin._save_cjpeg(img, 0, tempfile)
# Default save quality is 75%, so a tiny bit of difference is alright # Default save quality is 75%, so a tiny bit of difference is alright
assert_image_similar(img, Image.open(tempfile), 17) with Image.open(tempfile) as expected:
assert_image_similar(img, expected, 17)
def test_no_duplicate_0x1001_tag(self): def test_no_duplicate_0x1001_tag(self):
# Arrange # Arrange

68
Tests/test_imagedraw.py
View File

@ -96,7 +96,8 @@ def test_arc_end_le_start():
draw.arc(BBOX1, start=start, end=end) draw.arc(BBOX1, start=start, end=end)
# Assert # Assert
assert_image_equal(im, Image.open("Tests/images/imagedraw_arc_end_le_start.png")) with Image.open("Tests/images/imagedraw_arc_end_le_start.png") as expected:
assert_image_equal(im, expected)
def test_arc_no_loops(): def test_arc_no_loops():
@ -174,7 +175,8 @@ def test_arc_high():
draw.arc([110, 10, 189, 189], 20, 150, width=20, fill="white") draw.arc([110, 10, 189, 189], 20, 150, width=20, fill="white")
# Assert # Assert
assert_image_equal(im, Image.open("Tests/images/imagedraw_arc_high.png")) with Image.open("Tests/images/imagedraw_arc_high.png") as expected:
assert_image_equal(im, expected)
def test_bitmap(): def test_bitmap():
@ -188,7 +190,8 @@ def test_bitmap():
draw.bitmap((10, 10), small) draw.bitmap((10, 10), small)
# Assert # Assert
assert_image_equal(im, Image.open("Tests/images/imagedraw_bitmap.png")) with Image.open("Tests/images/imagedraw_bitmap.png") as expected:
assert_image_equal(im, expected)
def helper_chord(mode, bbox, start, end): def helper_chord(mode, bbox, start, end):
@ -260,7 +263,8 @@ def test_chord_too_fat():
draw.chord([-150, -150, 99, 99], 15, 60, width=10, fill="white", outline="red") draw.chord([-150, -150, 99, 99], 15, 60, width=10, fill="white", outline="red")
# Assert # Assert
assert_image_equal(im, Image.open("Tests/images/imagedraw_chord_too_fat.png")) with Image.open("Tests/images/imagedraw_chord_too_fat.png") as expected:
assert_image_equal(im, expected)
def helper_ellipse(mode, bbox): def helper_ellipse(mode, bbox):
@ -417,7 +421,8 @@ def helper_line(points):
draw.line(points, fill="yellow", width=2) draw.line(points, fill="yellow", width=2)
# Assert # Assert
assert_image_equal(im, Image.open("Tests/images/imagedraw_line.png")) with Image.open("Tests/images/imagedraw_line.png") as expected:
assert_image_equal(im, expected)
def test_line1(): def test_line1():
@ -446,7 +451,8 @@ def test_shape1():
draw.shape(s, fill=1) draw.shape(s, fill=1)
# Assert # Assert
assert_image_equal(im, Image.open("Tests/images/imagedraw_shape1.png")) with Image.open("Tests/images/imagedraw_shape1.png") as expected:
assert_image_equal(im, expected)
def test_shape2(): def test_shape2():
@ -467,7 +473,8 @@ def test_shape2():
draw.shape(s, outline="blue") draw.shape(s, outline="blue")
# Assert # Assert
assert_image_equal(im, Image.open("Tests/images/imagedraw_shape2.png")) with Image.open("Tests/images/imagedraw_shape2.png") as expected:
assert_image_equal(im, expected)
def helper_pieslice(bbox, start, end): def helper_pieslice(bbox, start, end):
@ -539,7 +546,8 @@ def test_pieslice_wide():
draw.pieslice([0, 0, 199, 99], 190, 170, width=10, fill="white", outline="red") draw.pieslice([0, 0, 199, 99], 190, 170, width=10, fill="white", outline="red")
# Assert # Assert
assert_image_equal(im, Image.open("Tests/images/imagedraw_pieslice_wide.png")) with Image.open("Tests/images/imagedraw_pieslice_wide.png") as expected:
assert_image_equal(im, expected)
def helper_point(points): def helper_point(points):
@ -551,7 +559,8 @@ def helper_point(points):
draw.point(points, fill="yellow") draw.point(points, fill="yellow")
# Assert # Assert
assert_image_equal(im, Image.open("Tests/images/imagedraw_point.png")) with Image.open("Tests/images/imagedraw_point.png") as expected:
assert_image_equal(im, expected)
def test_point1(): def test_point1():
@ -571,7 +580,8 @@ def helper_polygon(points):
draw.polygon(points, fill="red", outline="blue") draw.polygon(points, fill="red", outline="blue")
# Assert # Assert
assert_image_equal(im, Image.open("Tests/images/imagedraw_polygon.png")) with Image.open("Tests/images/imagedraw_polygon.png") as expected:
assert_image_equal(im, expected)
def test_polygon1(): def test_polygon1():
@ -589,13 +599,13 @@ def test_polygon_kite():
# Arrange # Arrange
im = Image.new(mode, (W, H)) im = Image.new(mode, (W, H))
draw = ImageDraw.Draw(im) draw = ImageDraw.Draw(im)
expected = f"Tests/images/imagedraw_polygon_kite_{mode}.png"
# Act # Act
draw.polygon(KITE_POINTS, fill="blue", outline="yellow") draw.polygon(KITE_POINTS, fill="blue", outline="yellow")
# Assert # Assert
assert_image_equal(im, Image.open(expected)) with Image.open(f"Tests/images/imagedraw_polygon_kite_{mode}.png") as expected:
assert_image_equal(im, expected)
def test_polygon_1px_high(): def test_polygon_1px_high():
@ -603,13 +613,13 @@ def test_polygon_1px_high():
# Arrange # Arrange
im = Image.new("RGB", (3, 3)) im = Image.new("RGB", (3, 3))
draw = ImageDraw.Draw(im) draw = ImageDraw.Draw(im)
expected = "Tests/images/imagedraw_polygon_1px_high.png"
# Act # Act
draw.polygon([(0, 1), (0, 1), (2, 1), (2, 1)], "#f00") draw.polygon([(0, 1), (0, 1), (2, 1), (2, 1)], "#f00")
# Assert # Assert
assert_image_equal(im, Image.open(expected)) with Image.open("Tests/images/imagedraw_polygon_1px_high.png") as expected:
assert_image_equal(im, expected)
def helper_rectangle(bbox): def helper_rectangle(bbox):
@ -621,7 +631,8 @@ def helper_rectangle(bbox):
draw.rectangle(bbox, fill="black", outline="green") draw.rectangle(bbox, fill="black", outline="green")
# Assert # Assert
assert_image_equal(im, Image.open("Tests/images/imagedraw_rectangle.png")) with Image.open("Tests/images/imagedraw_rectangle.png") as expected:
assert_image_equal(im, expected)
def test_rectangle1(): def test_rectangle1():
@ -650,26 +661,26 @@ def test_rectangle_width():
# Arrange # Arrange
im = Image.new("RGB", (W, H)) im = Image.new("RGB", (W, H))
draw = ImageDraw.Draw(im) draw = ImageDraw.Draw(im)
expected = "Tests/images/imagedraw_rectangle_width.png"
# Act # Act
draw.rectangle(BBOX1, outline="green", width=5) draw.rectangle(BBOX1, outline="green", width=5)
# Assert # Assert
assert_image_equal(im, Image.open(expected)) with Image.open("Tests/images/imagedraw_rectangle_width.png") as expected:
assert_image_equal(im, expected)
def test_rectangle_width_fill(): def test_rectangle_width_fill():
# Arrange # Arrange
im = Image.new("RGB", (W, H)) im = Image.new("RGB", (W, H))
draw = ImageDraw.Draw(im) draw = ImageDraw.Draw(im)
expected = "Tests/images/imagedraw_rectangle_width_fill.png"
# Act # Act
draw.rectangle(BBOX1, fill="blue", outline="green", width=5) draw.rectangle(BBOX1, fill="blue", outline="green", width=5)
# Assert # Assert
assert_image_equal(im, Image.open(expected)) with Image.open("Tests/images/imagedraw_rectangle_width_fill.png") as expected:
assert_image_equal(im, expected)
def test_rectangle_zero_width(): def test_rectangle_zero_width():
@ -694,9 +705,8 @@ def test_rectangle_I16():
draw.rectangle(BBOX1, fill="black", outline="green") draw.rectangle(BBOX1, fill="black", outline="green")
# Assert # Assert
assert_image_equal( with Image.open("Tests/images/imagedraw_rectangle_I.png") as expected:
im.convert("I"), Image.open("Tests/images/imagedraw_rectangle_I.png") assert_image_equal(im.convert("I"), expected)
)
def test_floodfill(): def test_floodfill():
@ -749,7 +759,8 @@ def test_floodfill_border():
) )
# Assert # Assert
assert_image_equal(im, Image.open("Tests/images/imagedraw_floodfill2.png")) with Image.open("Tests/images/imagedraw_floodfill2.png") as expected:
assert_image_equal(im, expected)
def test_floodfill_thresh(): def test_floodfill_thresh():
@ -765,7 +776,8 @@ def test_floodfill_thresh():
ImageDraw.floodfill(im, centre_point, ImageColor.getrgb("red"), thresh=30) ImageDraw.floodfill(im, centre_point, ImageColor.getrgb("red"), thresh=30)
# Assert # Assert
assert_image_equal(im, Image.open("Tests/images/imagedraw_floodfill2.png")) with Image.open("Tests/images/imagedraw_floodfill2.png") as expected:
assert_image_equal(im, expected)
def test_floodfill_not_negative(): def test_floodfill_not_negative():
@ -782,9 +794,8 @@ def test_floodfill_not_negative():
ImageDraw.floodfill(im, (int(W / 4), int(H / 4)), ImageColor.getrgb("red")) ImageDraw.floodfill(im, (int(W / 4), int(H / 4)), ImageColor.getrgb("red"))
# Assert # Assert
assert_image_equal( with Image.open("Tests/images/imagedraw_floodfill_not_negative.png") as expected:
im, Image.open("Tests/images/imagedraw_floodfill_not_negative.png") assert_image_equal(im, expected)
)
def create_base_image_draw( def create_base_image_draw(
@ -1185,7 +1196,8 @@ def test_draw_regular_polygon(n_sides, rotation, polygon_name):
draw = ImageDraw.Draw(im) draw = ImageDraw.Draw(im)
bounding_circle = ((W // 2, H // 2), 25) bounding_circle = ((W // 2, H // 2), 25)
draw.regular_polygon(bounding_circle, n_sides, rotation=rotation, fill="red") draw.regular_polygon(bounding_circle, n_sides, rotation=rotation, fill="red")
assert_image_equal(im, Image.open(filename)) with Image.open(filename) as expected:
assert_image_equal(im, expected)
@pytest.mark.parametrize( @pytest.mark.parametrize(

27
Tests/test_imagedraw2.py
View File

@ -55,13 +55,13 @@ def helper_ellipse(mode, bbox):
draw = ImageDraw2.Draw(im) draw = ImageDraw2.Draw(im)
pen = ImageDraw2.Pen("blue", width=2) pen = ImageDraw2.Pen("blue", width=2)
brush = ImageDraw2.Brush("green") brush = ImageDraw2.Brush("green")
expected = f"Tests/images/imagedraw_ellipse_{mode}.png"
# Act # Act
draw.ellipse(bbox, pen, brush) draw.ellipse(bbox, pen, brush)
# Assert # Assert
assert_image_similar(im, Image.open(expected), 1) with Image.open(f"Tests/images/imagedraw_ellipse_{mode}.png") as expected:
assert_image_similar(im, expected, 1)
def test_ellipse1(): def test_ellipse1():
@ -82,7 +82,8 @@ def test_ellipse_edge():
draw.ellipse(((0, 0), (W - 1, H - 1)), brush) draw.ellipse(((0, 0), (W - 1, H - 1)), brush)
# Assert # Assert
assert_image_similar(im, Image.open("Tests/images/imagedraw_ellipse_edge.png"), 1) with Image.open("Tests/images/imagedraw_ellipse_edge.png") as expected:
assert_image_similar(im, expected, 1)
def helper_line(points): def helper_line(points):
@ -95,7 +96,8 @@ def helper_line(points):
draw.line(points, pen) draw.line(points, pen)
# Assert # Assert
assert_image_equal(im, Image.open("Tests/images/imagedraw_line.png")) with Image.open("Tests/images/imagedraw_line.png") as expected:
assert_image_equal(im, expected)
def test_line1_pen(): def test_line1_pen():
@ -118,7 +120,8 @@ def test_line_pen_as_brush():
draw.line(POINTS1, pen, brush) draw.line(POINTS1, pen, brush)
# Assert # Assert
assert_image_equal(im, Image.open("Tests/images/imagedraw_line.png")) with Image.open("Tests/images/imagedraw_line.png") as expected:
assert_image_equal(im, expected)
def helper_polygon(points): def helper_polygon(points):
@ -132,7 +135,8 @@ def helper_polygon(points):
draw.polygon(points, pen, brush) draw.polygon(points, pen, brush)
# Assert # Assert
assert_image_equal(im, Image.open("Tests/images/imagedraw_polygon.png")) with Image.open("Tests/images/imagedraw_polygon.png") as expected:
assert_image_equal(im, expected)
def test_polygon1(): def test_polygon1():
@ -154,7 +158,8 @@ def helper_rectangle(bbox):
draw.rectangle(bbox, pen, brush) draw.rectangle(bbox, pen, brush)
# Assert # Assert
assert_image_equal(im, Image.open("Tests/images/imagedraw_rectangle.png")) with Image.open("Tests/images/imagedraw_rectangle.png") as expected:
assert_image_equal(im, expected)
def test_rectangle1(): def test_rectangle1():
@ -172,13 +177,13 @@ def test_big_rectangle():
bbox = [(-1, -1), (W + 1, H + 1)] bbox = [(-1, -1), (W + 1, H + 1)]
brush = ImageDraw2.Brush("orange") brush = ImageDraw2.Brush("orange")
draw = ImageDraw2.Draw(im) draw = ImageDraw2.Draw(im)
expected = "Tests/images/imagedraw_big_rectangle.png"
# Act # Act
draw.rectangle(bbox, brush) draw.rectangle(bbox, brush)
# Assert # Assert
assert_image_similar(im, Image.open(expected), 1) with Image.open("Tests/images/imagedraw_big_rectangle.png") as expected:
assert_image_similar(im, expected, 1)
@skip_unless_feature("freetype2") @skip_unless_feature("freetype2")
@ -187,13 +192,13 @@ def test_text():
im = Image.new("RGB", (W, H)) im = Image.new("RGB", (W, H))
draw = ImageDraw2.Draw(im) draw = ImageDraw2.Draw(im)
font = ImageDraw2.Font("white", FONT_PATH) font = ImageDraw2.Font("white", FONT_PATH)
expected = "Tests/images/imagedraw2_text.png"
# Act # Act
draw.text((5, 5), "ImageDraw2", font) draw.text((5, 5), "ImageDraw2", font)
# Assert # Assert
assert_image_similar(im, Image.open(expected), 13) with Image.open("Tests/images/imagedraw2_text.png") as expected:
assert_image_similar(im, expected, 13)
@skip_unless_feature("freetype2") @skip_unless_feature("freetype2")