ttCollection: don't close file inside init if lazy=True

Fixes 'seek of closed file' error #2549
This commit is contained in:
Cosimo Lupo 2022-03-17 12:30:40 +00:00
parent e1b3bfc807
commit 83ee6bcdab
2 changed files with 24 additions and 6 deletions

View File

@ -38,7 +38,12 @@ class TTCollection(object):
font = TTFont(file, fontNumber=i, _tableCache=tableCache, **kwargs) font = TTFont(file, fontNumber=i, _tableCache=tableCache, **kwargs)
fonts.append(font) fonts.append(font)
if closeStream: # don't close file if lazy=True, as the TTFont hold a reference to the original
# file; the file will be closed once the TTFonts are closed in the
# TTCollection.close(). We still want to close the file if lazy is None or
# False, because in that case the TTFont no longer need the original file
# and we want to avoid 'ResourceWarning: unclosed file'.
if not kwargs.get("lazy") and closeStream:
file.close() file.close()
def __enter__(self): def __enter__(self):

View File

@ -1,14 +1,27 @@
import os import os
from pathlib import Path
from fontTools.ttLib import TTCollection from fontTools.ttLib import TTCollection
import pytest import pytest
TTX_DATA_DIR = os.path.join(os.path.dirname(__file__), "..", "ttx", "data") TTX_DATA_DIR = Path(__file__).parent.parent / "ttx" / "data"
@pytest.mark.parametrize("lazy", [None, True, False]) @pytest.fixture(params=[None, True, False])
def test_lazy_open(lazy): def lazy(request):
ttc = os.path.join(TTX_DATA_DIR, "TestTTC.ttc") return request.param
with TTCollection(ttc, lazy=lazy) as collection:
def test_lazy_open_path(lazy):
ttc_path = TTX_DATA_DIR / "TestTTC.ttc"
with TTCollection(ttc_path, lazy=lazy) as collection:
assert len(collection) == 2
assert collection[0]["maxp"].numGlyphs == 6
assert collection[1]["maxp"].numGlyphs == 6
def test_lazy_open_file(lazy):
with (TTX_DATA_DIR / "TestTTC.ttc").open("rb") as file:
collection = TTCollection(file, lazy=lazy)
assert len(collection) == 2 assert len(collection) == 2
assert collection[0]["maxp"].numGlyphs == 6 assert collection[0]["maxp"].numGlyphs == 6
assert collection[1]["maxp"].numGlyphs == 6 assert collection[1]["maxp"].numGlyphs == 6