aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Mensinger <daniel@mensinger-ka.de>2019-02-12 19:49:19 +0100
committerDaniel Mensinger <daniel@mensinger-ka.de>2019-02-26 09:33:26 +0100
commitb69e45ebaca517a47ab39757d1f61f9fd5f55804 (patch)
treef1cb4b1ffd8fa410102b694033583cb15c343691
parentb2dd5fbe08faa3a5a070513b4ca529b2ac33d90b (diff)
downloadmeson-b69e45ebaca517a47ab39757d1f61f9fd5f55804.zip
meson-b69e45ebaca517a47ab39757d1f61f9fd5f55804.tar.gz
meson-b69e45ebaca517a47ab39757d1f61f9fd5f55804.tar.bz2
Fixed flake8
-rw-r--r--mesonbuild/dependencies/base.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py
index a9fc313..516b036 100644
--- a/mesonbuild/dependencies/base.py
+++ b/mesonbuild/dependencies/base.py
@@ -26,7 +26,7 @@ import textwrap
import platform
import itertools
import ctypes
-from typing import List
+from typing import List, Tuple
from enum import Enum
from pathlib import Path, PurePath
@@ -37,7 +37,6 @@ from ..environment import BinaryTable, Environment
from ..mesonlib import MachineChoice, MesonException, OrderedSet, PerMachine
from ..mesonlib import Popen_safe, version_compare_many, version_compare, listify
from ..mesonlib import Version
-from typing import List, Tuple
# These must be defined in this file to avoid cyclical references.
packages = {}
@@ -1116,7 +1115,7 @@ class CMakeDependency(ExternalDependency):
def _cached_listdir(self, path: str) -> List[Tuple[str, str]]:
if path not in CMakeDependency.class_listdir_cache:
try:
- CMakeDependency.class_listdir_cache[path] = [(x, str(x).lower()) for x in os.listdir(path)]
+ CMakeDependency.class_listdir_cache[path] = [(x, str(x).lower()) for x in os.listdir(path)]
except:
CMakeDependency.class_listdir_cache[path] = []
return CMakeDependency.class_listdir_cache[path]
@@ -1131,6 +1130,7 @@ class CMakeDependency(ExternalDependency):
def _preliminary_find_check(self, name: str, module_path: List[str]) -> bool:
lname = str(name).lower()
+
# Checks <path>, <path>/cmake, <path>/CMake
def find_module(path: str) -> bool:
for i in [path, os.path.join(path, 'cmake'), os.path.join(path, 'CMake')]: