shadowfacts/fonttools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't allow byte layer names

Browse Source
This commit is contained in:
Nikolaus Waxweiler 2019-09-14 21:55:46 +01:00
parent dcb1fb67ce
commit 562052bb86
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/fontTools/ufoLib/__init__.py
View File

@ -1323,8 +1323,6 @@ class UFOWriter(UFOReader):
for layerName in layerOrder:
if layerName is None:
layerName = DEFAULT_LAYER_NAME
else:
layerName = tostr(layerName)
newOrder.append(layerName)
layerOrder = newOrder
else:

5
Tests/ufoLib/UFO3_test.py
View File

@ -4138,8 +4138,7 @@ class UFO3WriteLayersTestCase(unittest.TestCase):
]
)
writer = UFOWriter(self.ufoPath)
# if passed bytes string, it'll be decoded to ASCII unicode string
writer.writeLayerContents(["public.default", "layer 2", b"layer 1"])
writer.writeLayerContents(["public.default", "layer 2", "layer 1"])
path = os.path.join(self.ufoPath, "layercontents.plist")
with open(path, "rb") as f:
result = plistlib.load(f)
@ -4149,7 +4148,7 @@ class UFO3WriteLayersTestCase(unittest.TestCase):
["layer 1", "glyphs.layer 1"],
]
self.assertEqual(expected, result)
for layerName, directory in result:
for layerName, _ in result:
assert isinstance(layerName, str)
# -----