diff options
| author | Hemmo Nieminen <hemmo.nieminen@iki.fi> | 2016-03-22 19:31:55 +0200 |
|---|---|---|
| committer | Hemmo Nieminen <hemmo.nieminen@iki.fi> | 2016-04-01 00:52:45 +0300 |
| commit | 336904b55309c9b5f14e4511655af6028e04c03d (patch) | |
| tree | 940541514425aa38e940ef4ed4c1289d66c259b3 /mesonbuild/optinterpreter.py | |
| parent | 5764bee2f42260c2869986b197fdccadac071257 (diff) | |
| download | meson-336904b55309c9b5f14e4511655af6028e04c03d.zip meson-336904b55309c9b5f14e4511655af6028e04c03d.tar.gz meson-336904b55309c9b5f14e4511655af6028e04c03d.tar.bz2 | |
Move MesonException from coredata to mesonlib.
Diffstat (limited to 'mesonbuild/optinterpreter.py')
| -rw-r--r-- | mesonbuild/optinterpreter.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mesonbuild/optinterpreter.py b/mesonbuild/optinterpreter.py index e2f7ca5..aaa99b0 100644 --- a/mesonbuild/optinterpreter.py +++ b/mesonbuild/optinterpreter.py @@ -14,6 +14,7 @@ from . import mparser from . import coredata +from . import mesonlib import os, re forbidden_option_names = coredata.builtin_options @@ -37,7 +38,7 @@ def is_invalid_name(name): return True return False -class OptionException(coredata.MesonException): +class OptionException(mesonlib.MesonException): pass optname_regex = re.compile('[^a-zA-Z0-9_-]') @@ -77,7 +78,7 @@ class OptionInterpreter: def process(self, option_file): try: ast = mparser.Parser(open(option_file, 'r', encoding='utf8').read()).parse() - except coredata.MesonException as me: + except mesonlib.MesonException as me: me.file = option_file raise me if not isinstance(ast, mparser.CodeBlockNode): |