-
-
Notifications
You must be signed in to change notification settings - Fork 2.2k
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.
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
Added type hints to Tests/test_font_*.py #7743
Changes from 2 commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,7 @@ | ||
from __future__ import annotations | ||
|
||
import os | ||
from pathlib import PosixPath | ||
|
||
import pytest | ||
|
||
|
@@ -20,7 +21,7 @@ | |
pytestmark = skip_unless_feature("zlib") | ||
|
||
|
||
def save_font(request, tmp_path): | ||
def save_font(request: pytest.FixtureRequest, tmp_path: PosixPath) -> str: | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why not There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ok, I've pushed a commit to update it, both the changes from here and #7732 |
||
with open(fontname, "rb") as test_file: | ||
font = PcfFontFile.PcfFontFile(test_file) | ||
assert isinstance(font, FontFile.FontFile) | ||
|
@@ -29,7 +30,7 @@ def save_font(request, tmp_path): | |
|
||
tempname = str(tmp_path / "temp.pil") | ||
|
||
def delete_tempfile(): | ||
def delete_tempfile() -> None: | ||
try: | ||
os.remove(tempname[:-4] + ".pbm") | ||
except OSError: | ||
|
@@ -47,25 +48,25 @@ def delete_tempfile(): | |
return tempname | ||
|
||
|
||
def test_sanity(request, tmp_path): | ||
def test_sanity(request: pytest.FixtureRequest, tmp_path: PosixPath) -> None: | ||
save_font(request, tmp_path) | ||
|
||
|
||
def test_less_than_256_characters(): | ||
def test_less_than_256_characters() -> None: | ||
with open("Tests/fonts/10x20-ISO8859-1-fewer-characters.pcf", "rb") as test_file: | ||
font = PcfFontFile.PcfFontFile(test_file) | ||
assert isinstance(font, FontFile.FontFile) | ||
# check the number of characters in the font | ||
assert len([_f for _f in font.glyph if _f]) == 127 | ||
|
||
|
||
def test_invalid_file(): | ||
def test_invalid_file() -> None: | ||
with open("Tests/images/flower.jpg", "rb") as fp: | ||
with pytest.raises(SyntaxError): | ||
PcfFontFile.PcfFontFile(fp) | ||
|
||
|
||
def test_draw(request, tmp_path): | ||
def test_draw(request: pytest.FixtureRequest, tmp_path: PosixPath) -> None: | ||
tempname = save_font(request, tmp_path) | ||
font = ImageFont.load(tempname) | ||
im = Image.new("L", (130, 30), "white") | ||
|
@@ -74,7 +75,7 @@ def test_draw(request, tmp_path): | |
assert_image_similar_tofile(im, "Tests/images/test_draw_pbm_target.png", 0) | ||
|
||
|
||
def test_textsize(request, tmp_path): | ||
def test_textsize(request: pytest.FixtureRequest, tmp_path: PosixPath) -> None: | ||
tempname = save_font(request, tmp_path) | ||
font = ImageFont.load(tempname) | ||
for i in range(255): | ||
|
@@ -90,7 +91,9 @@ def test_textsize(request, tmp_path): | |
assert font.getbbox(msg) == (0, 0, len(msg) * 10, 20) | ||
|
||
|
||
def _test_high_characters(request, tmp_path, message): | ||
def _test_high_characters( | ||
request: pytest.FixtureRequest, tmp_path: PosixPath, message: str | bytes | ||
) -> None: | ||
tempname = save_font(request, tmp_path) | ||
font = ImageFont.load(tempname) | ||
im = Image.new("L", (750, 30), "white") | ||
|
@@ -99,7 +102,7 @@ def _test_high_characters(request, tmp_path, message): | |
assert_image_similar_tofile(im, "Tests/images/high_ascii_chars.png", 0) | ||
|
||
|
||
def test_high_characters(request, tmp_path): | ||
def test_high_characters(request: pytest.FixtureRequest, tmp_path: PosixPath) -> None: | ||
message = "".join(chr(i + 1) for i in range(140, 232)) | ||
_test_high_characters(request, tmp_path, message) | ||
# accept bytes instances. | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,7 @@ | ||
from __future__ import annotations | ||
|
||
import os | ||
from pathlib import PosixPath | ||
|
||
import pytest | ||
|
||
|
@@ -14,7 +15,7 @@ | |
|
||
fontname = "Tests/fonts/ter-x20b.pcf" | ||
|
||
charsets = { | ||
charsets: dict[str, dict[str, int | str]] = { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You can remove the There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ok, I've pushed a commit for this. |
||
"iso8859-1": { | ||
"glyph_count": 223, | ||
"message": "hello, world", | ||
|
@@ -36,7 +37,9 @@ | |
pytestmark = skip_unless_feature("zlib") | ||
|
||
|
||
def save_font(request, tmp_path, encoding): | ||
def save_font( | ||
request: pytest.FixtureRequest, tmp_path: PosixPath, encoding: str | ||
) -> str: | ||
with open(fontname, "rb") as test_file: | ||
font = PcfFontFile.PcfFontFile(test_file, encoding) | ||
assert isinstance(font, FontFile.FontFile) | ||
|
@@ -45,7 +48,7 @@ def save_font(request, tmp_path, encoding): | |
|
||
tempname = str(tmp_path / "temp.pil") | ||
|
||
def delete_tempfile(): | ||
def delete_tempfile() -> None: | ||
try: | ||
os.remove(tempname[:-4] + ".pbm") | ||
except OSError: | ||
|
@@ -64,23 +67,34 @@ def delete_tempfile(): | |
|
||
|
||
@pytest.mark.parametrize("encoding", ("iso8859-1", "iso8859-2", "cp1250")) | ||
def test_sanity(request, tmp_path, encoding): | ||
def test_sanity( | ||
request: pytest.FixtureRequest, tmp_path: PosixPath, encoding: str | ||
) -> None: | ||
save_font(request, tmp_path, encoding) | ||
|
||
|
||
@pytest.mark.parametrize("encoding", ("iso8859-1", "iso8859-2", "cp1250")) | ||
def test_draw(request, tmp_path, encoding): | ||
def test_draw( | ||
request: pytest.FixtureRequest, tmp_path: PosixPath, encoding: str | ||
) -> None: | ||
tempname = save_font(request, tmp_path, encoding) | ||
font = ImageFont.load(tempname) | ||
im = Image.new("L", (150, 30), "white") | ||
draw = ImageDraw.Draw(im) | ||
message = charsets[encoding]["message"].encode(encoding) | ||
draw.text((0, 0), message, "black", font=font) | ||
assert_image_similar_tofile(im, charsets[encoding]["image1"], 0) | ||
|
||
message = charsets[encoding]["message"] | ||
assert isinstance(message, str) | ||
draw.text((0, 0), message.encode(encoding), "black", font=font) | ||
|
||
expected_path = charsets[encoding]["image1"] | ||
assert isinstance(expected_path, str) | ||
assert_image_similar_tofile(im, expected_path, 0) | ||
|
||
|
||
@pytest.mark.parametrize("encoding", ("iso8859-1", "iso8859-2", "cp1250")) | ||
def test_textsize(request, tmp_path, encoding): | ||
def test_textsize( | ||
request: pytest.FixtureRequest, tmp_path: PosixPath, encoding: str | ||
) -> None: | ||
tempname = save_font(request, tmp_path, encoding) | ||
font = ImageFont.load(tempname) | ||
for i in range(255): | ||
|
@@ -90,8 +104,10 @@ def test_textsize(request, tmp_path, encoding): | |
assert dy == 20 | ||
assert dx in (0, 10) | ||
assert font.getlength(bytearray([i])) == dx | ||
message = charsets[encoding]["message"].encode(encoding) | ||
for i in range(len(message)): | ||
msg = message[: i + 1] | ||
message = charsets[encoding]["message"] | ||
assert isinstance(message, str) | ||
message_bytes = message.encode(encoding) | ||
for i in range(len(message_bytes)): | ||
msg = message_bytes[: i + 1] | ||
assert font.getlength(msg) == len(msg) * 10 | ||
assert font.getbbox(msg) == (0, 0, len(msg) * 10, 20) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It looks like this test is checking for leaks with a PIL font and was also broken by #7354.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok, I've created #7748 for this.