From 83766b3687b3d639af5175e9b1dc8fd039659b55 Mon Sep 17 00:00:00 2001
From: Xavier Claessens <xavier.claessens@collabora.com>
Date: Sun, 30 Dec 2018 20:29:20 -0500
Subject: [PATCH] Fix flake8 errors

---
 mesonbuild/astinterpreter.py  | 2 +-
 mesonbuild/interpreter.py     | 3 +--
 mesonbuild/interpreterbase.py | 1 -
 mesonbuild/modules/python.py  | 3 +--
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/mesonbuild/astinterpreter.py b/mesonbuild/astinterpreter.py
index a447a5597..f68aa7a14 100644
--- a/mesonbuild/astinterpreter.py
+++ b/mesonbuild/astinterpreter.py
@@ -15,7 +15,7 @@
 # This class contains the basic functionality needed to run any interpreter
 # or an interpreter-based tool.
 
-from . import interpreterbase, mlog, mparser, mesonlib
+from . import interpreterbase, mparser, mesonlib
 from . import environment
 
 from .interpreterbase import InterpreterException, InvalidArguments, BreakRequest, ContinueRequest
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
index 1e36bf1e2..7ee9a3f97 100644
--- a/mesonbuild/interpreter.py
+++ b/mesonbuild/interpreter.py
@@ -37,7 +37,6 @@ import re, shlex
 import subprocess
 from collections import namedtuple
 from pathlib import PurePath
-import traceback
 import functools
 
 import importlib
@@ -3062,7 +3061,7 @@ external dependencies (including libraries) must go to "dependencies".''')
         sp_kwargs = {
             'default_options': kwargs.get('default_options', []),
             'required': kwargs.get('required', True),
-            }
+        }
         self.do_subproject(dirname, sp_kwargs)
         return self.get_subproject_dep(display_name, dirname, varname, kwargs)
 
diff --git a/mesonbuild/interpreterbase.py b/mesonbuild/interpreterbase.py
index 707b8f702..48c52204b 100644
--- a/mesonbuild/interpreterbase.py
+++ b/mesonbuild/interpreterbase.py
@@ -749,7 +749,6 @@ The result of this is undefined and will become a hard error in a future Meson r
             except IndexError:
                 raise InterpreterException('Index %d out of bounds of array of size %d.' % (index, len(iobject)))
 
-
     def function_call(self, node):
         func_name = node.func_name
         (posargs, kwargs) = self.reduce_arguments(node.args)
diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py
index c14ac8588..1d41165be 100644
--- a/mesonbuild/modules/python.py
+++ b/mesonbuild/modules/python.py
@@ -23,11 +23,10 @@ from . import ExtensionModule
 from mesonbuild.modules import ModuleReturnValue
 from ..interpreterbase import (
     noPosargs, noKwargs, permittedKwargs,
-    InterpreterObject, InvalidArguments,
+    InvalidArguments,
     FeatureNew, FeatureNewKwargs, disablerIfNotFound
 )
 from ..interpreter import ExternalProgramHolder, extract_required_kwarg
-from ..interpreterbase import flatten
 from ..build import known_shmod_kwargs
 from .. import mlog
 from ..environment import detect_cpu_family