aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrien Tétar2015-11-07 19:57:29 +0100
committerAdrien Tétar2015-11-07 19:57:29 +0100
commit4f484fb40a051171edfd7c0c0ccabdae8089a223 (patch)
treef5b7429eee2fc76ed931844c0b21eb7108ffaceb
parent759d466a0ce2208d7187463fde12b5f974a23b42 (diff)
downloadtrufont-4f484fb40a051171edfd7c0c0ccabdae8089a223.tar.bz2
fontView: resist to malformed glyphList
-rw-r--r--Lib/defconQt/__main__.py7
-rw-r--r--Lib/defconQt/util/glyphList.py4
2 files changed, 8 insertions, 3 deletions
diff --git a/Lib/defconQt/__main__.py b/Lib/defconQt/__main__.py
index 79fa2cf..b64405d 100644
--- a/Lib/defconQt/__main__.py
+++ b/Lib/defconQt/__main__.py
@@ -26,7 +26,12 @@ def main():
glyphListPath = settings.value("settings/glyphListPath", type=str)
if glyphListPath and os.path.exists(glyphListPath):
from defconQt.util import glyphList
- app.GL2UV = glyphList.parseGlyphList(glyphListPath)
+ try:
+ glyphList = glyphList.parseGlyphList(glyphListPath)
+ except Exception as e:
+ print(e)
+ else:
+ app.GL2UV = glyphList
window = MainWindow(font)
window.show()
sys.exit(app.exec_())
diff --git a/Lib/defconQt/util/glyphList.py b/Lib/defconQt/util/glyphList.py
index 7c16268..ee97d78 100644
--- a/Lib/defconQt/util/glyphList.py
+++ b/Lib/defconQt/util/glyphList.py
@@ -11,8 +11,8 @@ def parseGlyphList(path):
continue
m = _parseGL_RE.match(line)
if not m:
- print("warning: syntax error in glyphlist: %s".format(
- repr(line[:20])))
+ raise SyntaxError("syntax error in glyphlist: %s"
+ .format(repr(line[:20])))
glyphName = m.group(1)
if glyphName in GL2UV:
print("warning: glyphName redefined in glyphList: {}".format(