aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/mparser.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2016-04-06 23:10:20 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2016-04-06 23:10:20 +0300
commitcab5ce4fc0eeee6024632cfb3815a7b6e3b70885 (patch)
tree70ce279332b2c3730204ffa7dc2e9b01059c5921 /mesonbuild/mparser.py
parent5d53c6b7415b62f2172129a61770cf38aa3f3c1d (diff)
parent3f3fcace3d91da7d2643354e06a4b8d3c7143f86 (diff)
downloadmeson-cab5ce4fc0eeee6024632cfb3815a7b6e3b70885.zip
meson-cab5ce4fc0eeee6024632cfb3815a7b6e3b70885.tar.gz
meson-cab5ce4fc0eeee6024632cfb3815a7b6e3b70885.tar.bz2
Merge pull request #438 from trhd/testing_options
New options for controlling test output.
Diffstat (limited to 'mesonbuild/mparser.py')
-rw-r--r--mesonbuild/mparser.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/mparser.py b/mesonbuild/mparser.py
index 090684c..fd720fb 100644
--- a/mesonbuild/mparser.py
+++ b/mesonbuild/mparser.py
@@ -13,7 +13,7 @@
# limitations under the License.
import re
-from .coredata import MesonException
+from .mesonlib import MesonException
class ParseException(MesonException):
def __init__(self, text, lineno, colno):