Merge pull request #3936 from nulano/revert-3931-update-freetype-epsilon

Revert "Update epsilon for FreeType 2.10 with eg. Unicode width 16" and skip test_unicode_extended on Python 2.x instead
This commit is contained in:
Hugo 2019-07-06 18:26:03 +03:00 committed by GitHub
commit 844a550a34
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -53,8 +53,7 @@ class TestImageFont(PillowTestCase):
# (and, other things, but first things first) # (and, other things, but first things first)
METRICS = { METRICS = {
(">=2.3", "<2.4"): {"multiline": 30, "textsize": 12, "getters": (13, 16)}, (">=2.3", "<2.4"): {"multiline": 30, "textsize": 12, "getters": (13, 16)},
(">=2.7", "<2.10"): {"multiline": 6.2, "textsize": 2.5, "getters": (12, 16)}, (">=2.7",): {"multiline": 6.2, "textsize": 2.5, "getters": (12, 16)},
(">=2.10",): {"multiline": 14.8, "textsize": 2.5, "getters": (12, 16)},
"Default": {"multiline": 0.5, "textsize": 0.5, "getters": (12, 16)}, "Default": {"multiline": 0.5, "textsize": 0.5, "getters": (12, 16)},
} }
@ -465,9 +464,8 @@ class TestImageFont(PillowTestCase):
font.getsize(u"") font.getsize(u"")
@unittest.skipIf( @unittest.skipIf(
sys.platform.startswith("win32") sys.version.startswith("2") or hasattr(sys, "pypy_translation_info"),
and (sys.version.startswith("2") or hasattr(sys, "pypy_translation_info")), "requires CPython 3.3+",
"requires CPython 3.x on Windows",
) )
def test_unicode_extended(self): def test_unicode_extended(self):
# issue #3777 # issue #3777