diff options
| author | Benjamin Redelings <benjamin.redelings@gmail.com> | 2017-12-30 16:06:17 -0800 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-02-19 01:32:16 +0530 |
| commit | 286e1f7d4ff1383e8466c161bf6dd2eda036b7ff (patch) | |
| tree | 32aa1007f217f183f60ff4ec027dfea8c4889da5 | |
| parent | c9a71ff243aa08cf1855027fbab38ab1ae0a20c8 (diff) | |
| download | meson-286e1f7d4ff1383e8466c161bf6dd2eda036b7ff.zip meson-286e1f7d4ff1383e8466c161bf6dd2eda036b7ff.tar.gz meson-286e1f7d4ff1383e8466c161bf6dd2eda036b7ff.tar.bz2 | |
Remove unqualified import and add mesonlib. in from of symbols.
| -rw-r--r-- | mesonbuild/dependencies/misc.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py index 38b0a10..6eeb16a 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 <boost/version.hpp>', self.env, self.get_compile_args(), []) - except EnvironmentException: + except mesonlib.EnvironmentException: return except TypeError: return |