From 286e1f7d4ff1383e8466c161bf6dd2eda036b7ff Mon Sep 17 00:00:00 2001 From: Benjamin Redelings Date: Sat, 30 Dec 2017 16:06:17 -0800 Subject: [PATCH] Remove unqualified import and add mesonlib. in from of symbols. --- mesonbuild/dependencies/misc.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py index 38b0a10eb..6eeb16a5e 100644 --- a/mesonbuild/dependencies/misc.py +++ b/mesonbuild/dependencies/misc.py @@ -25,7 +25,6 @@ from pathlib import Path from .. import mlog from .. import mesonlib -from ..mesonlib import Popen_safe, extract_as_list, EnvironmentException from ..environment import detect_cpu_family from .base import ( @@ -250,7 +249,7 @@ class BoostDependency(ExternalDependency): return args def get_requested(self, kwargs): - candidates = extract_as_list(kwargs, 'modules') + candidates = mesonlib.extract_as_list(kwargs, 'modules') for c in candidates: if not isinstance(c, str): raise DependencyException('Boost module argument is not a string.') @@ -265,7 +264,7 @@ class BoostDependency(ExternalDependency): def detect_version(self): try: version = self.compiler.get_define('BOOST_LIB_VERSION', '#include ', self.env, self.get_compile_args(), []) - except EnvironmentException: + except mesonlib.EnvironmentException: return except TypeError: return