Fix several more lint errors

Found by Igor Gnatenko

************* Module mesonbuild.interpreter
E:1232,33: No value for argument 'interp' in constructor call (no-value-for-parameter)
************* Module mesonbuild.dependencies
E: 68, 4: An attribute defined in mesonbuild.dependencies line 39 hides this method (method-hidden)
************* Module mesonbuild.environment
E: 26, 0: class already defined line 19 (function-redefined)
E: 68,18: Undefined variable 'InterpreterException' (undefined-variable)
E:641,39: Undefined variable 'want_cross' (undefined-variable)
E:850,94: Undefined variable 'varname' (undefined-variable)
E:854,94: Undefined variable 'varname' (undefined-variable)
E:860,102: Undefined variable 'varname' (undefined-variable)
E:863,94: Undefined variable 'varname' (undefined-variable)
************* Module mesonbuild.modules.gnome
E:438,26: Undefined variable 'compilers' (undefined-variable)

Author: nirbheek

mesonbuild/compilers.py

@@ -18,7 +18,7 @@
 import tempfile
 from .import mesonlib
 from . import mlog
-from .mesonlib import MesonException, version_compare, Popen_safe
+from .mesonlib import EnvironmentException, MesonException, version_compare, Popen_safe
 from . import coredata
 
 """This file contains the data files of all compilers Meson knows
@@ -314,10 +314,6 @@ def build_unix_rpath_args(build_dir, rpath_paths, install_rpath):
                 paths = paths + ':' + padding
         return ['-Wl,-rpath,' + paths]
 
-class EnvironmentException(MesonException):
-    def __init(self, *args, **kwargs):
-        Exception.__init__(self, *args, **kwargs)
-
 class CrossNoRunException(MesonException):
     def __init(self, *args, **kwargs):
         Exception.__init__(self, *args, **kwargs)

mesonbuild/dependencies.py

@@ -65,9 +65,6 @@ def get_exe_args(self):
     def need_threads(self):
         return False
 
-    def type_name(self):
-        return self.type_name
-
     def get_pkgconfig_variable(self, variable_name):
         raise MesonException('Tried to get a pkg-config variable from a non-pkgconfig dependency.')
 

mesonbuild/environment.py

@@ -17,16 +17,12 @@
 from . import mesonlib
 from . import mlog
 from .compilers import *
-from .mesonlib import Popen_safe
+from .mesonlib import EnvironmentException, Popen_safe
 import configparser
 import shutil
 
 build_filename = 'meson.build'
 
-class EnvironmentException(mesonlib.MesonException):
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
 def find_coverage_tools():
     gcovr_exe = 'gcovr'
     lcov_exe = 'lcov'
@@ -65,7 +61,7 @@ def detect_native_windows_arch():
             # If this doesn't exist, something is messing with the environment
             arch = os.environ['PROCESSOR_ARCHITECTURE'].lower()
         except KeyError:
-            raise InterpreterException('Unable to detect native OS architecture')
+            raise EnvironmentException('Unable to detect native OS architecture')
     return arch
 
 def detect_windows_arch(compilers):
@@ -629,7 +625,7 @@ def detect_rust_compiler(self):
             return RustCompiler(exelist, version)
         raise EnvironmentException('Unknown compiler "' + ' '.join(exelist) + '"')
 
-    def detect_d_compiler(self):
+    def detect_d_compiler(self, want_cross):
         exelist = None
         is_cross = False
         # Search for a D compiler.
@@ -847,20 +843,20 @@ def parse_datafile(self, filename):
             for entry in config[s]:
                 value = config[s][entry]
                 if ' ' in entry or '\t' in entry or "'" in entry or '"' in entry:
-                    raise EnvironmentException('Malformed variable name %s in cross file..' % varname)
+                    raise EnvironmentException('Malformed variable name %s in cross file..' % entry)
                 try:
                     res = eval(value, {'true' : True, 'false' : False})
                 except Exception:
-                    raise EnvironmentException('Malformed value in cross file variable %s.' % varname)
+                    raise EnvironmentException('Malformed value in cross file variable %s.' % entry)
                 if self.ok_type(res):
                     self.config[s][entry] = res
                 elif isinstance(res, list):
                     for i in res:
                         if not self.ok_type(i):
-                            raise EnvironmentException('Malformed value in cross file variable %s.' % varname)
+                            raise EnvironmentException('Malformed value in cross file variable %s.' % entry)
                     self.config[s][entry] = res
                 else:
-                    raise EnvironmentException('Malformed value in cross file variable %s.' % varname)
+                    raise EnvironmentException('Malformed value in cross file variable %s.' % entry)
 
     def has_host(self):
         return 'host_machine' in self.config

mesonbuild/interpreter.py

@@ -1229,7 +1229,7 @@ def module_method_callback(self, invalues):
                 outvalues.append(v)
             elif isinstance(v, build.Executable):
                 self.add_target(v.name, v)
-                outvalues.append(ExecutableHolder(v))
+                outvalues.append(ExecutableHolder(v, self))
             elif isinstance(v, list):
                 outvalues.append(self.module_method_callback(v))
             elif isinstance(v, build.GeneratedList):
@@ -1572,15 +1572,15 @@ def detect_compilers(self, lang, need_cross_compiler):
         elif lang == 'vala':
             comp = self.environment.detect_vala_compiler()
             if need_cross_compiler:
-                        cross_comp = comp  # Vala is too (I think).
+                cross_comp = comp  # Vala compiles to platform-independent C
         elif lang == 'd':
-            comp = self.environment.detect_d_compiler()
+            comp = self.environment.detect_d_compiler(False)
             if need_cross_compiler:
-                cross_comp = comp  # D as well (AFAIK).
+                cross_comp = self.environment.detect_d_compiler(True)
         elif lang == 'rust':
             comp = self.environment.detect_rust_compiler()
             if need_cross_compiler:
-                cross_comp = comp  # FIXME, probably not correct.
+                cross_comp = comp  # FIXME, not correct.
         elif lang == 'fortran':
             comp = self.environment.detect_fortran_compiler(False)
             if need_cross_compiler:

mesonbuild/mesonlib.py

@@ -22,6 +22,10 @@ class MesonException(Exception):
     def __init__(self, *args, **kwargs):
         Exception.__init__(self, *args, **kwargs)
 
+class EnvironmentException(MesonException):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
 class File:
     def __init__(self, is_built, subdir, fname):
         self.is_built = is_built

mesonbuild/modules/gnome.py

@@ -24,6 +24,7 @@
 from ..dependencies import Dependency, PkgConfigDependency, InternalDependency
 from .. import mlog
 from .. import mesonlib
+from .. import compilers
 from .. import interpreter
 from . import find_program, GResourceTarget, GResourceHeaderTarget, GirTarget, TypelibTarget, VapiTarget