Improved naming of properties and classes (per Denis comments).

7 files changed, 21 insertions, 19 deletions

diff --git a/lib/spack/spack/__init__.py b/lib/spack/spack/__init__.py
index 62ac793d90..83355ad28c 100644
--- a/lib/spack/spack/__init__.py
+++ b/lib/spack/spack/__init__.py
@@ -214,8 +214,8 @@ __all__ += [
     'IntelPackage',
 ]
 
-from spack.mixins import FilterCompilerWrappersPackageMixin
-__all__ += ['FilterCompilerWrappersPackageMixin']
+import spack.mixins as mixins
+__all__ += ['mixins']
 
 from spack.version import Version, ver
 __all__ += ['Version', 'ver']
diff --git a/lib/spack/spack/mixins.py b/lib/spack/spack/mixins.py
index be3c2c3136..0a354362ce 100644
--- a/lib/spack/spack/mixins.py
+++ b/lib/spack/spack/mixins.py
@@ -27,14 +27,14 @@ import os
 import llnl.util.filesystem
 
 
-class FilterCompilerWrappersPackageMixin(object):
+class FilterCompilerWrappers(object):
     """This mixin class registers a callback that filters a list of files
     after installation and substitutes hardcoded paths pointing to the Spack
     compiler wrappers with the corresponding 'real' compilers.
     """
 
     #: compiler wrappers to be filtered (needs to be overridden)
-    compiler_wrappers = []
+    to_be_filtered_for_wrappers = []
 
     #: phase after which the callback is invoked (default 'install')
     filter_phase = 'install'
@@ -43,7 +43,7 @@ class FilterCompilerWrappersPackageMixin(object):
 
         attr_name = '_InstallPhase_{0}'.format(self.filter_phase)
 
-        # Here we want to get the attribute directly from the class (noe from
+        # Here we want to get the attribute directly from the class (not from
         # the instance), so that we can modify it and add the mixin method
         phase = getattr(type(self), attr_name)
 
@@ -54,10 +54,10 @@ class FilterCompilerWrappersPackageMixin(object):
         phase = getattr(type(self), attr_name)
 
         phase.run_after.append(
-            FilterCompilerWrappersPackageMixin.filter_compilers
+            FilterCompilerWrappers.filter_compilers
         )
 
-        super(FilterCompilerWrappersPackageMixin, self).__init__()
+        super(FilterCompilerWrappers, self).__init__()
 
     def filter_compilers(self):
         """Substitutes any path referring to a Spack compiler wrapper
@@ -70,8 +70,10 @@ class FilterCompilerWrappersPackageMixin(object):
 
         kwargs = {'ignore_absent': True, 'backup': False, 'string': True}
 
-        if self.compiler_wrappers:
-            x = llnl.util.filesystem.FileFilter(*self.compiler_wrappers)
+        if self.to_be_filtered_for_wrappers:
+            x = llnl.util.filesystem.FileFilter(
+                *self.to_be_filtered_for_wrappers
+            )
 
             x.filter(os.environ['CC'], self.compiler.cc, **kwargs)
             x.filter(os.environ['CXX'], self.compiler.cxx, **kwargs)
diff --git a/var/spack/repos/builtin/packages/hdf5/package.py b/var/spack/repos/builtin/packages/hdf5/package.py
index 471326aac7..5c164e049a 100644
--- a/var/spack/repos/builtin/packages/hdf5/package.py
+++ b/var/spack/repos/builtin/packages/hdf5/package.py
@@ -28,7 +28,7 @@ import sys
 from spack import *
 
 
-class Hdf5(AutotoolsPackage, FilterCompilerWrappersPackageMixin):
+class Hdf5(AutotoolsPackage, mixins.FilterCompilerWrappers):
     """HDF5 is a data model, library, and file format for storing and managing
     data. It supports an unlimited variety of datatypes, and is designed for
     flexible and efficient I/O and for high volume and complex data.
@@ -297,7 +297,7 @@ HDF5 version {version} {version}
         shutil.rmtree(checkdir)
 
     @property
-    def compiler_wrappers(self):
+    def to_be_filtered_for_wrappers(self):
         return [
             join_path(self.prefix.bin, 'h5c++'),
             join_path(self.prefix.bin, 'h5cc'),
diff --git a/var/spack/repos/builtin/packages/mpich/package.py b/var/spack/repos/builtin/packages/mpich/package.py
index 0efca4f325..b689fefbdb 100644
--- a/var/spack/repos/builtin/packages/mpich/package.py
+++ b/var/spack/repos/builtin/packages/mpich/package.py
@@ -26,7 +26,7 @@ from spack import *
 import os
 
 
-class Mpich(AutotoolsPackage, FilterCompilerWrappersPackageMixin):
+class Mpich(AutotoolsPackage, mixins.FilterCompilerWrappers):
     """MPICH is a high performance and widely portable implementation of
     the Message Passing Interface (MPI) standard."""
 
@@ -171,7 +171,7 @@ spack package at this time.''',
         return config_args
 
     @property
-    def compiler_wrappers(self):
+    def to_be_filtered_for_wrappers(self):
         return [
             join_path(self.prefix.bin, 'mpicc'),
             join_path(self.prefix.bin, 'mpicxx'),
diff --git a/var/spack/repos/builtin/packages/mvapich2/package.py b/var/spack/repos/builtin/packages/mvapich2/package.py
index 1f90981fda..cc6568883f 100644
--- a/var/spack/repos/builtin/packages/mvapich2/package.py
+++ b/var/spack/repos/builtin/packages/mvapich2/package.py
@@ -35,7 +35,7 @@ def _process_manager_validator(values):
         )
 
 
-class Mvapich2(AutotoolsPackage, FilterCompilerWrappersPackageMixin):
+class Mvapich2(AutotoolsPackage, mixins.FilterCompilerWrappers):
     """MVAPICH2 is an MPI implementation for Infiniband networks."""
     homepage = "http://mvapich.cse.ohio-state.edu/"
     url = "http://mvapich.cse.ohio-state.edu/download/mvapich/mv2/mvapich2-2.2.tar.gz"
@@ -233,7 +233,7 @@ class Mvapich2(AutotoolsPackage, FilterCompilerWrappersPackageMixin):
         return args
 
     @property
-    def compiler_wrappers(self):
+    def to_be_filtered_for_wrappers(self):
         return [
             join_path(self.prefix.bin, 'mpicc'),
             join_path(self.prefix.bin, 'mpicxx'),
diff --git a/var/spack/repos/builtin/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py
index 7362b9be7f..3c0db25ced 100644
--- a/var/spack/repos/builtin/packages/openmpi/package.py
+++ b/var/spack/repos/builtin/packages/openmpi/package.py
@@ -64,7 +64,7 @@ def _mxm_dir():
         return None
 
 
-class Openmpi(AutotoolsPackage, FilterCompilerWrappersPackageMixin):
+class Openmpi(AutotoolsPackage, mixins.FilterCompilerWrappers):
     """The Open MPI Project is an open source Message Passing Interface
        implementation that is developed and maintained by a consortium
        of academic, research, and industry partners. Open MPI is
@@ -376,7 +376,7 @@ class Openmpi(AutotoolsPackage, FilterCompilerWrappersPackageMixin):
         return config_args
 
     @property
-    def compiler_wrappers(self):
+    def to_be_filtered_for_wrappers(self):
 
         basepath = join_path(self.prefix, 'share', 'openmpi')
 
diff --git a/var/spack/repos/builtin/packages/r/package.py b/var/spack/repos/builtin/packages/r/package.py
index 514fcd9d8b..2f5fc1b3af 100644
--- a/var/spack/repos/builtin/packages/r/package.py
+++ b/var/spack/repos/builtin/packages/r/package.py
@@ -26,7 +26,7 @@ import shutil
 from spack import *
 
 
-class R(AutotoolsPackage, FilterCompilerWrappersPackageMixin):
+class R(AutotoolsPackage, mixins.FilterCompilerWrappers):
     """R is 'GNU S', a freely available language and environment for
     statistical computing and graphics which provides a wide variety of
     statistical and graphical techniques: linear and nonlinear modelling,
@@ -130,7 +130,7 @@ class R(AutotoolsPackage, FilterCompilerWrappersPackageMixin):
         shutil.copy(src_makeconf, dst_makeconf)
 
     @property
-    def compiler_wrappers(self):
+    def to_be_filtered_for_wrappers(self):
         return [join_path(self.etcdir, 'Makeconf')]
 
     # ========================================================================