From 45838cee0b8b01ad999b459ed6d19e37686859c0 Mon Sep 17 00:00:00 2001
From: "Adam J. Stewart" <ajstewart426@gmail.com>
Date: Wed, 5 Jul 2023 09:04:29 -0500
Subject: Drop Python 2 super syntax (#38718)

---
 var/spack/repos/builder.test/packages/inheritance/package.py      | 2 +-
 .../repos/builder.test/packages/old-style-autotools/package.py    | 2 +-
 .../repos/builder.test/packages/old-style-derived/package.py      | 2 +-
 var/spack/repos/builtin.mock/packages/archive-files/package.py    | 2 +-
 var/spack/repos/builtin.mock/packages/py-test-callback/package.py | 2 +-
 var/spack/repos/builtin/packages/amdblis/package.py               | 4 ++--
 var/spack/repos/builtin/packages/amdlibflame/package.py           | 2 +-
 .../amdlibm/0001-libm-ose-Scripts-cleanup-pyc-files.patch         | 8 ++++----
 var/spack/repos/builtin/packages/amdscalapack/package.py          | 2 +-
 var/spack/repos/builtin/packages/axom/package.py                  | 6 +++---
 var/spack/repos/builtin/packages/bcl2fastq2/package.py            | 2 +-
 var/spack/repos/builtin/packages/busco/package.py                 | 4 ++--
 var/spack/repos/builtin/packages/catalyst/package.py              | 2 +-
 var/spack/repos/builtin/packages/cfitsio/package.py               | 2 +-
 var/spack/repos/builtin/packages/chai/package.py                  | 4 ++--
 var/spack/repos/builtin/packages/clingo-bootstrap/package.py      | 2 +-
 var/spack/repos/builtin/packages/cp2k/package.py                  | 2 +-
 var/spack/repos/builtin/packages/cppcheck/package.py              | 2 +-
 var/spack/repos/builtin/packages/findutils/package.py             | 2 +-
 var/spack/repos/builtin/packages/fujitsu-frontistr/package.py     | 2 +-
 var/spack/repos/builtin/packages/gcc/package.py                   | 2 +-
 var/spack/repos/builtin/packages/gchp/package.py                  | 2 +-
 var/spack/repos/builtin/packages/genie/package.py                 | 4 ++--
 var/spack/repos/builtin/packages/graphviz/package.py              | 2 +-
 .../repos/builtin/packages/gromacs-chain-coordinate/package.py    | 2 +-
 var/spack/repos/builtin/packages/gromacs-swaxs/package.py         | 2 +-
 var/spack/repos/builtin/packages/hip-rocclr/package.py            | 2 +-
 var/spack/repos/builtin/packages/intel-mpi/package.py             | 2 +-
 .../repos/builtin/packages/intel-oneapi-compilers/package.py      | 4 ++--
 var/spack/repos/builtin/packages/intel-oneapi-mkl/package.py      | 2 +-
 var/spack/repos/builtin/packages/intel-parallel-studio/package.py | 2 +-
 var/spack/repos/builtin/packages/kallisto/package.py              | 2 +-
 var/spack/repos/builtin/packages/lbann/package.py                 | 4 ++--
 var/spack/repos/builtin/packages/libpsl/package.py                | 2 +-
 var/spack/repos/builtin/packages/lua/package.py                   | 2 +-
 var/spack/repos/builtin/packages/mesa/package.py                  | 2 +-
 var/spack/repos/builtin/packages/mumax/package.py                 | 2 +-
 var/spack/repos/builtin/packages/munge/package.py                 | 2 +-
 var/spack/repos/builtin/packages/openexr/package.py               | 2 +-
 var/spack/repos/builtin/packages/openjpeg/package.py              | 2 +-
 var/spack/repos/builtin/packages/openloops/get-process-list.py    | 2 +-
 var/spack/repos/builtin/packages/perl/package.py                  | 2 +-
 var/spack/repos/builtin/packages/photos-f/package.py              | 2 +-
 var/spack/repos/builtin/packages/postgresql/package.py            | 2 +-
 var/spack/repos/builtin/packages/py-keras/package.py              | 2 +-
 var/spack/repos/builtin/packages/py-pybind11/package.py           | 2 +-
 var/spack/repos/builtin/packages/py-sip/package.py                | 2 +-
 var/spack/repos/builtin/packages/raja/package.py                  | 4 ++--
 var/spack/repos/builtin/packages/sed/package.py                   | 2 +-
 var/spack/repos/builtin/packages/singularityce/package.py         | 2 +-
 var/spack/repos/builtin/packages/spectre/package.py               | 4 +---
 .../builtin/packages/srcml-identifier-getter-tool/package.py      | 2 +-
 var/spack/repos/builtin/packages/turbomole/package.py             | 2 +-
 var/spack/repos/builtin/packages/umpire/package.py                | 4 ++--
 var/spack/repos/tutorial/packages/netlib-lapack/package.py        | 8 ++++----
 55 files changed, 71 insertions(+), 73 deletions(-)

(limited to 'var')

diff --git a/var/spack/repos/builder.test/packages/inheritance/package.py b/var/spack/repos/builder.test/packages/inheritance/package.py
index ebece88fbc..a3028ac412 100644
--- a/var/spack/repos/builder.test/packages/inheritance/package.py
+++ b/var/spack/repos/builder.test/packages/inheritance/package.py
@@ -16,7 +16,7 @@ class Inheritance(spack.pkg.builder.test.callbacks.Callbacks):
 
 class GenericBuilder(spack.pkg.builder.test.callbacks.GenericBuilder):
     def install(self, pkg, spec, prefix):
-        super(GenericBuilder, self).install(pkg, spec, prefix)
+        super().install(pkg, spec, prefix)
         os.environ["INHERITANCE_INSTALL_CALLED"] = "1"
         os.environ["INSTALL_VALUE"] = "INHERITANCE"
 
diff --git a/var/spack/repos/builder.test/packages/old-style-autotools/package.py b/var/spack/repos/builder.test/packages/old-style-autotools/package.py
index 41be49b5ba..4ace870768 100644
--- a/var/spack/repos/builder.test/packages/old-style-autotools/package.py
+++ b/var/spack/repos/builder.test/packages/old-style-autotools/package.py
@@ -31,7 +31,7 @@ class OldStyleAutotools(AutotoolsPackage):
         """This override a function in the builder and construct the result using a method
         defined in this class and a super method defined in the builder.
         """
-        return [self.foo()] + super(OldStyleAutotools, self).configure_args()
+        return [self.foo()] + super().configure_args()
 
     def foo(self):
         return "--with-foo"
diff --git a/var/spack/repos/builder.test/packages/old-style-derived/package.py b/var/spack/repos/builder.test/packages/old-style-derived/package.py
index 159d0d4b13..352ddae075 100644
--- a/var/spack/repos/builder.test/packages/old-style-derived/package.py
+++ b/var/spack/repos/builder.test/packages/old-style-derived/package.py
@@ -18,4 +18,4 @@ class OldStyleDerived(spack.pkg.builder.test.old_style_autotools.OldStyleAutotoo
     version("1.0", md5="0123456789abcdef0123456789abcdef")
 
     def configure_args(self):
-        return ["--with-bar"] + super(OldStyleDerived, self).configure_args()
+        return ["--with-bar"] + super().configure_args()
diff --git a/var/spack/repos/builtin.mock/packages/archive-files/package.py b/var/spack/repos/builtin.mock/packages/archive-files/package.py
index 6aba55cdbc..9c6fe207df 100644
--- a/var/spack/repos/builtin.mock/packages/archive-files/package.py
+++ b/var/spack/repos/builtin.mock/packages/archive-files/package.py
@@ -17,7 +17,7 @@ class ArchiveFiles(AutotoolsPackage):
 
     @property
     def archive_files(self):
-        return super(ArchiveFiles, self).archive_files + ["../../outside.log"]
+        return super().archive_files + ["../../outside.log"]
 
     def autoreconf(self, spec, prefix):
         pass
diff --git a/var/spack/repos/builtin.mock/packages/py-test-callback/package.py b/var/spack/repos/builtin.mock/packages/py-test-callback/package.py
index 26e0e09997..936772717a 100644
--- a/var/spack/repos/builtin.mock/packages/py-test-callback/package.py
+++ b/var/spack/repos/builtin.mock/packages/py-test-callback/package.py
@@ -24,6 +24,6 @@ class PyTestCallback(mp.Python):
 
     # TODO (post-34236): "test" -> "test_callback" once remove "test" support
     def test(self):
-        super(PyTestCallback, self).test()
+        super().test()
 
         print("PyTestCallback test")
diff --git a/var/spack/repos/builtin/packages/amdblis/package.py b/var/spack/repos/builtin/packages/amdblis/package.py
index bfad712644..1209dd8c60 100644
--- a/var/spack/repos/builtin/packages/amdblis/package.py
+++ b/var/spack/repos/builtin/packages/amdblis/package.py
@@ -43,7 +43,7 @@ class Amdblis(BlisBase):
 
     def configure_args(self):
         spec = self.spec
-        args = super(Amdblis, self).configure_args()
+        args = super().configure_args()
 
         if spec.satisfies("+ilp64"):
             args.append("--blas-int-size=64")
@@ -62,7 +62,7 @@ class Amdblis(BlisBase):
         return args
 
     def config_args(self):
-        config_args = super(Amdblis, self).config_args()
+        config_args = super().config_args()
 
         # "amdzen" - A fat binary or multiarchitecture binary
         # support for 3.1 release onwards
diff --git a/var/spack/repos/builtin/packages/amdlibflame/package.py b/var/spack/repos/builtin/packages/amdlibflame/package.py
index 3f1ace5984..571fd9babf 100644
--- a/var/spack/repos/builtin/packages/amdlibflame/package.py
+++ b/var/spack/repos/builtin/packages/amdlibflame/package.py
@@ -73,7 +73,7 @@ class Amdlibflame(LibflameBase):
 
     def configure_args(self):
         """configure_args function"""
-        args = super(Amdlibflame, self).configure_args()
+        args = super().configure_args()
 
         # From 3.2 version, amd optimized flags are encapsulated under:
         # enable-amd-flags for gcc compiler
diff --git a/var/spack/repos/builtin/packages/amdlibm/0001-libm-ose-Scripts-cleanup-pyc-files.patch b/var/spack/repos/builtin/packages/amdlibm/0001-libm-ose-Scripts-cleanup-pyc-files.patch
index fc084b7d4b..d23a169c4b 100644
--- a/var/spack/repos/builtin/packages/amdlibm/0001-libm-ose-Scripts-cleanup-pyc-files.patch
+++ b/var/spack/repos/builtin/packages/amdlibm/0001-libm-ose-Scripts-cleanup-pyc-files.patch
@@ -325,7 +325,7 @@ index c2f8c8e..eb89a73 100644
  from . import Compiler
  class Gcc(Compiler):
 -    def __init__(self, prod_mode):
--        super(Gcc, self).__init__(prod_mode)
+-        super().__init__(prod_mode)
 -
 -        warnings_cxx  = [
 -            '-Wctor-dtor-privacy',
@@ -334,7 +334,7 @@ index c2f8c8e..eb89a73 100644
 -            '-Wold-style-cast',
 -            '-Woverloaded-virtual',
 +    def __init__(self, prod_mode, bvars = None, opts = None):
-+        super(Gcc, self).__init__(prod_mode, bvars, opts)
++        super().__init__(prod_mode, bvars, opts)
 +        self.cmd = 'gcc'
 +        self.cxxcmd = 'g++'
 +        self.compile_flags_debug = [
@@ -474,13 +474,13 @@ index 0e4c346..b39d341 100644
  
  class LLVM(Compiler):
 -    def __init__(self, prod_mode):
--        super(LLVM, self).__init__(prod_mode)
+-        super().__init__(prod_mode)
 -
 -        compile_flags_release = [
 -            # fp-contract needed to generate FMA instructions
 -            '-ffp-contract=fast',
 +    def __init__(self, prod_mode, bvars = None, opts = None):
-+        super(LLVM, self).__init__(prod_mode, bvars, opts)
++        super().__init__(prod_mode, bvars, opts)
 +        self.cmd = 'clang'
 +        self.cxxcmd = 'clang++'
 +        self.compile_flags_debug = [
diff --git a/var/spack/repos/builtin/packages/amdscalapack/package.py b/var/spack/repos/builtin/packages/amdscalapack/package.py
index c6b1a4ea13..3da1a8a03b 100644
--- a/var/spack/repos/builtin/packages/amdscalapack/package.py
+++ b/var/spack/repos/builtin/packages/amdscalapack/package.py
@@ -49,7 +49,7 @@ class Amdscalapack(ScalapackBase):
 
     def cmake_args(self):
         """cmake_args function"""
-        args = super(Amdscalapack, self).cmake_args()
+        args = super().cmake_args()
         spec = self.spec
 
         if spec.satisfies("%gcc@10:"):
diff --git a/var/spack/repos/builtin/packages/axom/package.py b/var/spack/repos/builtin/packages/axom/package.py
index 0b8bc8e61b..4e7e311591 100644
--- a/var/spack/repos/builtin/packages/axom/package.py
+++ b/var/spack/repos/builtin/packages/axom/package.py
@@ -206,7 +206,7 @@ class Axom(CachedCMakePackage, CudaPackage, ROCmPackage):
 
     def initconfig_compiler_entries(self):
         spec = self.spec
-        entries = super(Axom, self).initconfig_compiler_entries()
+        entries = super().initconfig_compiler_entries()
 
         if "+fortran" in spec:
             entries.append(cmake_cache_option("ENABLE_FORTRAN", True))
@@ -229,7 +229,7 @@ class Axom(CachedCMakePackage, CudaPackage, ROCmPackage):
 
     def initconfig_hardware_entries(self):
         spec = self.spec
-        entries = super(Axom, self).initconfig_hardware_entries()
+        entries = super().initconfig_hardware_entries()
 
         if "+cuda" in spec:
             entries.append(cmake_cache_option("ENABLE_CUDA", True))
@@ -352,7 +352,7 @@ class Axom(CachedCMakePackage, CudaPackage, ROCmPackage):
 
     def initconfig_mpi_entries(self):
         spec = self.spec
-        entries = super(Axom, self).initconfig_mpi_entries()
+        entries = super().initconfig_mpi_entries()
 
         if "+mpi" in spec:
             entries.append(cmake_cache_option("ENABLE_MPI", True))
diff --git a/var/spack/repos/builtin/packages/bcl2fastq2/package.py b/var/spack/repos/builtin/packages/bcl2fastq2/package.py
index 689fa51b09..9b49f6073c 100644
--- a/var/spack/repos/builtin/packages/bcl2fastq2/package.py
+++ b/var/spack/repos/builtin/packages/bcl2fastq2/package.py
@@ -70,7 +70,7 @@ class Bcl2fastq2(Package):
         # wrap (decorate) the standard expand_archive step with a
         # helper, then call the real do_stage().
         self.stage.expand_archive = self.unpack_it(self.stage.expand_archive)
-        super(Bcl2fastq2, self).do_stage(mirror_only)
+        super().do_stage(mirror_only)
 
     def unpack_it(self, f):
         def wrap():
diff --git a/var/spack/repos/builtin/packages/busco/package.py b/var/spack/repos/builtin/packages/busco/package.py
index de8e7d94e2..5f6a6b7cf0 100644
--- a/var/spack/repos/builtin/packages/busco/package.py
+++ b/var/spack/repos/builtin/packages/busco/package.py
@@ -44,14 +44,14 @@ class Busco(PythonPackage):
         if self.spec.satisfies("@4.1.3:"):
             install_tree("bin", prefix.bin)
             install_tree("config", prefix.config)
-            super(Busco, self).install(spec, prefix)
+            super().install(spec, prefix)
         if self.spec.satisfies("@3.0.1"):
             with working_dir("scripts"):
                 mkdirp(prefix.bin)
                 install("generate_plot.py", prefix.bin)
                 install("run_BUSCO.py", prefix.bin)
             install_tree("config", prefix.config)
-            super(Busco, self).install(spec, prefix)
+            super().install(spec, prefix)
         if self.spec.satisfies("@2.0.1"):
             mkdirp(prefix.bin)
             install("BUSCO.py", prefix.bin)
diff --git a/var/spack/repos/builtin/packages/catalyst/package.py b/var/spack/repos/builtin/packages/catalyst/package.py
index 262236839b..2fb7b9bd3c 100644
--- a/var/spack/repos/builtin/packages/catalyst/package.py
+++ b/var/spack/repos/builtin/packages/catalyst/package.py
@@ -86,7 +86,7 @@ class Catalyst(CMakePackage):
     def do_stage(self, mirror_only=False):
         """Unpacks and expands the fetched tarball.
         Then, generate the catalyst source files."""
-        super(Catalyst, self).do_stage(mirror_only)
+        super().do_stage(mirror_only)
 
         # extract the catalyst part
         catalyst_script = os.path.join(self.stage.source_path, "Catalyst", "catalyze.py")
diff --git a/var/spack/repos/builtin/packages/cfitsio/package.py b/var/spack/repos/builtin/packages/cfitsio/package.py
index 63224ae619..1cca3d6e92 100644
--- a/var/spack/repos/builtin/packages/cfitsio/package.py
+++ b/var/spack/repos/builtin/packages/cfitsio/package.py
@@ -33,7 +33,7 @@ class Cfitsio(AutotoolsPackage):
 
     def url_for_version(self, version):
         if version >= Version("3.47"):
-            return super(Cfitsio, self).url_for_version(version)
+            return super().url_for_version(version)
 
         url = "http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio{0}0.tar.gz"
         return url.format(version.joined)
diff --git a/var/spack/repos/builtin/packages/chai/package.py b/var/spack/repos/builtin/packages/chai/package.py
index 4b3dc99098..ea81e86d74 100644
--- a/var/spack/repos/builtin/packages/chai/package.py
+++ b/var/spack/repos/builtin/packages/chai/package.py
@@ -114,14 +114,14 @@ class Chai(CachedCMakePackage, CudaPackage, ROCmPackage):
 
     def initconfig_compiler_entries(self):
         spec = self.spec
-        entries = super(Chai, self).initconfig_compiler_entries()
+        entries = super().initconfig_compiler_entries()
         if "+rocm" in spec:
             entries.insert(0, cmake_cache_path("CMAKE_CXX_COMPILER", spec["hip"].hipcc))
         return entries
 
     def initconfig_hardware_entries(self):
         spec = self.spec
-        entries = super(Chai, self).initconfig_hardware_entries()
+        entries = super().initconfig_hardware_entries()
 
         entries.append(cmake_cache_option("ENABLE_OPENMP", "+openmp" in spec))
 
diff --git a/var/spack/repos/builtin/packages/clingo-bootstrap/package.py b/var/spack/repos/builtin/packages/clingo-bootstrap/package.py
index 0d2914ae7d..0e77dde84b 100644
--- a/var/spack/repos/builtin/packages/clingo-bootstrap/package.py
+++ b/var/spack/repos/builtin/packages/clingo-bootstrap/package.py
@@ -50,7 +50,7 @@ class ClingoBootstrap(Clingo):
         return self.define("CLINGO_BUILD_PY_SHARED", "OFF")
 
     def cmake_args(self):
-        args = super(ClingoBootstrap, self).cmake_args()
+        args = super().cmake_args()
         args.extend(
             [
                 # Avoid building the clingo executable
diff --git a/var/spack/repos/builtin/packages/cp2k/package.py b/var/spack/repos/builtin/packages/cp2k/package.py
index ee969b64bc..f3789b179f 100644
--- a/var/spack/repos/builtin/packages/cp2k/package.py
+++ b/var/spack/repos/builtin/packages/cp2k/package.py
@@ -705,7 +705,7 @@ class Cp2k(MakefilePackage, CudaPackage):
         # Apparently the Makefile bases its paths on PWD
         # so we need to set PWD = self.build_directory
         with spack.util.environment.set_env(PWD=self.build_directory):
-            super(Cp2k, self).build(spec, prefix)
+            super().build(spec, prefix)
 
             with working_dir(self.build_directory):
                 make("libcp2k", *self.build_targets)
diff --git a/var/spack/repos/builtin/packages/cppcheck/package.py b/var/spack/repos/builtin/packages/cppcheck/package.py
index 0731e4b00f..d0aaae8ac5 100644
--- a/var/spack/repos/builtin/packages/cppcheck/package.py
+++ b/var/spack/repos/builtin/packages/cppcheck/package.py
@@ -47,7 +47,7 @@ class Cppcheck(CMakePackage):
         return args
 
     def install(self, spec, prefix):
-        super(Cppcheck, self).install(spec, prefix)
+        super().install(spec, prefix)
         # Manually install the final cppcheck binary
         if spec.satisfies("+htmlreport"):
             install("htmlreport/cppcheck-htmlreport", prefix.bin)
diff --git a/var/spack/repos/builtin/packages/findutils/package.py b/var/spack/repos/builtin/packages/findutils/package.py
index 5e095a4551..46bd4d3255 100644
--- a/var/spack/repos/builtin/packages/findutils/package.py
+++ b/var/spack/repos/builtin/packages/findutils/package.py
@@ -22,7 +22,7 @@ class Findutils(AutotoolsPackage, GNUMirrorPackage):
         if version < Version("4.7.0"):
             self.gnu_mirror_path = "findutils/findutils-{0}.tar.gz".format(version)
 
-        return super(Findutils, self).url_for_version(version)
+        return super().url_for_version(version)
 
     executables = ["^find$"]
 
diff --git a/var/spack/repos/builtin/packages/fujitsu-frontistr/package.py b/var/spack/repos/builtin/packages/fujitsu-frontistr/package.py
index 9903757f00..fc788e2754 100644
--- a/var/spack/repos/builtin/packages/fujitsu-frontistr/package.py
+++ b/var/spack/repos/builtin/packages/fujitsu-frontistr/package.py
@@ -32,7 +32,7 @@ class FujitsuFrontistr(FrontistrBase):
 
     def cmake_args(self):
         define = self.define
-        args = super(FujitsuFrontistr, self).cmake_args()
+        args = super().cmake_args()
         if self.spec.satisfies("%fj"):
             args.extend(
                 [
diff --git a/var/spack/repos/builtin/packages/gcc/package.py b/var/spack/repos/builtin/packages/gcc/package.py
index 8828bd9baa..6b312e96df 100644
--- a/var/spack/repos/builtin/packages/gcc/package.py
+++ b/var/spack/repos/builtin/packages/gcc/package.py
@@ -628,7 +628,7 @@ class Gcc(AutotoolsPackage, GNUMirrorPackage):
             "7.1.0"
         ):
             self.gnu_mirror_path = self.gnu_mirror_path.replace("xz", "bz2")
-        return super(Gcc, self).url_for_version(version)
+        return super().url_for_version(version)
 
     def patch(self):
         spec = self.spec
diff --git a/var/spack/repos/builtin/packages/gchp/package.py b/var/spack/repos/builtin/packages/gchp/package.py
index deb1744e7d..f32639a3ac 100644
--- a/var/spack/repos/builtin/packages/gchp/package.py
+++ b/var/spack/repos/builtin/packages/gchp/package.py
@@ -57,7 +57,7 @@ class Gchp(CMakePackage):
         return args
 
     def install(self, spec, prefix):
-        super(Gchp, self).install(spec, prefix)
+        super().install(spec, prefix)
         # Preserve source code in prefix for two reasons:
         # 1. Run directory creation occurs independently of code compilation,
         # possibly multiple times depending on user needs,
diff --git a/var/spack/repos/builtin/packages/genie/package.py b/var/spack/repos/builtin/packages/genie/package.py
index 5b2de80c9b..5b4aa017fa 100644
--- a/var/spack/repos/builtin/packages/genie/package.py
+++ b/var/spack/repos/builtin/packages/genie/package.py
@@ -88,11 +88,11 @@ class Genie(Package):
 
     def setup_build_environment(self, env):
         env.set("GENIE", self.stage.source_path)
-        return super(Genie, self).setup_build_environment(env)
+        return super().setup_build_environment(env)
 
     def setup_run_environment(self, env):
         env.set("GENIE", self.prefix)
-        return super(Genie, self).setup_run_environment(env)
+        return super().setup_run_environment(env)
 
     def install(self, spec, prefix):
         configure = Executable("./configure")
diff --git a/var/spack/repos/builtin/packages/graphviz/package.py b/var/spack/repos/builtin/packages/graphviz/package.py
index a39eb85299..743e8093ac 100644
--- a/var/spack/repos/builtin/packages/graphviz/package.py
+++ b/var/spack/repos/builtin/packages/graphviz/package.py
@@ -152,7 +152,7 @@ class Graphviz(AutotoolsPackage):
 
     def setup_build_environment(self, env):
         # Set MACOSX_DEPLOYMENT_TARGET to 10.x due to old configure
-        super(Graphviz, self).setup_build_environment(env)
+        super().setup_build_environment(env)
 
         if "+quartz" in self.spec:
             env.set("OBJC", self.compiler.cc)
diff --git a/var/spack/repos/builtin/packages/gromacs-chain-coordinate/package.py b/var/spack/repos/builtin/packages/gromacs-chain-coordinate/package.py
index c991a3e5a8..1133d5d1dc 100644
--- a/var/spack/repos/builtin/packages/gromacs-chain-coordinate/package.py
+++ b/var/spack/repos/builtin/packages/gromacs-chain-coordinate/package.py
@@ -45,7 +45,7 @@ class GromacsChainCoordinate(Gromacs):
                 del self.versions[version_key]
 
     def __init__(self, spec):
-        super(GromacsChainCoordinate, self).__init__(spec)
+        super().__init__(spec)
 
         self.remove_parent_versions()
 
diff --git a/var/spack/repos/builtin/packages/gromacs-swaxs/package.py b/var/spack/repos/builtin/packages/gromacs-swaxs/package.py
index 3b3890c4dd..ac97d477be 100644
--- a/var/spack/repos/builtin/packages/gromacs-swaxs/package.py
+++ b/var/spack/repos/builtin/packages/gromacs-swaxs/package.py
@@ -148,6 +148,6 @@ class GromacsSwaxs(Gromacs):
                 del self.versions[version_key]
 
     def __init__(self, spec):
-        super(GromacsSwaxs, self).__init__(spec)
+        super().__init__(spec)
 
         self.remove_parent_versions()
diff --git a/var/spack/repos/builtin/packages/hip-rocclr/package.py b/var/spack/repos/builtin/packages/hip-rocclr/package.py
index 67a7a0380e..febde10d81 100644
--- a/var/spack/repos/builtin/packages/hip-rocclr/package.py
+++ b/var/spack/repos/builtin/packages/hip-rocclr/package.py
@@ -232,6 +232,6 @@ class HipRocclr(CMakePackage):
         return args
 
     def __init__(self, spec):
-        super(HipRocclr, self).__init__(spec)
+        super().__init__(spec)
         if self.spec.satisfies("@4.5.0:"):
             self.phases = ["cmake", "build"]
diff --git a/var/spack/repos/builtin/packages/intel-mpi/package.py b/var/spack/repos/builtin/packages/intel-mpi/package.py
index 9011e57494..070cdbed70 100644
--- a/var/spack/repos/builtin/packages/intel-mpi/package.py
+++ b/var/spack/repos/builtin/packages/intel-mpi/package.py
@@ -146,7 +146,7 @@ class IntelMpi(IntelPackage):
         )
 
     def setup_run_environment(self, env):
-        super(IntelMpi, self).setup_run_environment(env)
+        super().setup_run_environment(env)
 
         for name, value in self.mpi_compiler_wrappers.items():
             env.set(name, value)
diff --git a/var/spack/repos/builtin/packages/intel-oneapi-compilers/package.py b/var/spack/repos/builtin/packages/intel-oneapi-compilers/package.py
index da758f1717..df36e99376 100644
--- a/var/spack/repos/builtin/packages/intel-oneapi-compilers/package.py
+++ b/var/spack/repos/builtin/packages/intel-oneapi-compilers/package.py
@@ -183,7 +183,7 @@ class IntelOneapiCompilers(IntelOneApiPackage):
 
         and from setting CC/CXX/F77/FC
         """
-        super(IntelOneapiCompilers, self).setup_run_environment(env)
+        super().setup_run_environment(env)
 
         env.set("CC", self.component_prefix.linux.bin.icx)
         env.set("CXX", self.component_prefix.linux.bin.icpx)
@@ -195,7 +195,7 @@ class IntelOneapiCompilers(IntelOneApiPackage):
         # install_tree("/opt/intel/oneapi/compiler", self.prefix)
 
         # install cpp
-        super(IntelOneapiCompilers, self).install(spec, prefix)
+        super().install(spec, prefix)
 
         # install fortran
         self.install_component(find("fortran-installer", "*")[0])
diff --git a/var/spack/repos/builtin/packages/intel-oneapi-mkl/package.py b/var/spack/repos/builtin/packages/intel-oneapi-mkl/package.py
index 033e41d305..9f4b7c6b98 100644
--- a/var/spack/repos/builtin/packages/intel-oneapi-mkl/package.py
+++ b/var/spack/repos/builtin/packages/intel-oneapi-mkl/package.py
@@ -136,7 +136,7 @@ class IntelOneapiMkl(IntelOneApiLibraryPackage):
             return IntelOneApiStaticLibraryList(libs, system_libs)
 
     def setup_run_environment(self, env):
-        super(IntelOneapiMkl, self).setup_run_environment(env)
+        super().setup_run_environment(env)
 
         # Support RPATH injection to the library directories when the '-mkl' or '-qmkl'
         # flag of the Intel compilers are used outside the Spack build environment. We
diff --git a/var/spack/repos/builtin/packages/intel-parallel-studio/package.py b/var/spack/repos/builtin/packages/intel-parallel-studio/package.py
index 7667eecfbc..84810bacfa 100644
--- a/var/spack/repos/builtin/packages/intel-parallel-studio/package.py
+++ b/var/spack/repos/builtin/packages/intel-parallel-studio/package.py
@@ -596,7 +596,7 @@ class IntelParallelStudio(IntelPackage):
         )
 
     def setup_run_environment(self, env):
-        super(IntelParallelStudio, self).setup_run_environment(env)
+        super().setup_run_environment(env)
 
         for name, value in self.mpi_compiler_wrappers.items():
             env.set(name, value)
diff --git a/var/spack/repos/builtin/packages/kallisto/package.py b/var/spack/repos/builtin/packages/kallisto/package.py
index caab3ae563..85e4740f93 100644
--- a/var/spack/repos/builtin/packages/kallisto/package.py
+++ b/var/spack/repos/builtin/packages/kallisto/package.py
@@ -57,7 +57,7 @@ class Kallisto(CMakePackage):
         """Call the original std_cmake_args and then filter the verbose
         setting.
         """
-        a = super(Kallisto, self).std_cmake_args
+        a = super().std_cmake_args
         if self.spec.satisfies("@0.44.0:"):
             args = [i for i in a if i != "-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON"]
             if self.spec.satisfies("@0.46.2:"):
diff --git a/var/spack/repos/builtin/packages/lbann/package.py b/var/spack/repos/builtin/packages/lbann/package.py
index d62f735612..54a0c690f2 100644
--- a/var/spack/repos/builtin/packages/lbann/package.py
+++ b/var/spack/repos/builtin/packages/lbann/package.py
@@ -347,7 +347,7 @@ class Lbann(CachedCMakePackage, CudaPackage, ROCmPackage):
 
     def initconfig_compiler_entries(self):
         spec = self.spec
-        entries = super(Lbann, self).initconfig_compiler_entries()
+        entries = super().initconfig_compiler_entries()
         entries.append(cmake_cache_string("CMAKE_CXX_STANDARD", "17"))
         if not spec.satisfies("^cmake@3.23.0"):
             # There is a bug with using Ninja generator in this version
@@ -368,7 +368,7 @@ class Lbann(CachedCMakePackage, CudaPackage, ROCmPackage):
 
     def initconfig_hardware_entries(self):
         spec = self.spec
-        entries = super(Lbann, self).initconfig_hardware_entries()
+        entries = super().initconfig_hardware_entries()
 
         if "+cuda" in spec:
             if self.spec.satisfies("%clang"):
diff --git a/var/spack/repos/builtin/packages/libpsl/package.py b/var/spack/repos/builtin/packages/libpsl/package.py
index ebaaade803..f4d4991f79 100644
--- a/var/spack/repos/builtin/packages/libpsl/package.py
+++ b/var/spack/repos/builtin/packages/libpsl/package.py
@@ -29,7 +29,7 @@ class Libpsl(AutotoolsPackage):
 
     def url_for_version(self, version):
         if version >= Version("0.21.1"):
-            return super(Libpsl, self).url_for_version(version)
+            return super().url_for_version(version)
         url_fmt = (
             "https://github.com/rockdaboot/libpsl/releases/download/libpsl-{0}/libpsl-{0}.tar.gz"
         )
diff --git a/var/spack/repos/builtin/packages/lua/package.py b/var/spack/repos/builtin/packages/lua/package.py
index fbe125cee2..60b13628d2 100644
--- a/var/spack/repos/builtin/packages/lua/package.py
+++ b/var/spack/repos/builtin/packages/lua/package.py
@@ -29,7 +29,7 @@ class LuaImplPackage(MakefilePackage):
     lua_version_override = None
 
     def __init__(self, *args, **kwargs):
-        super(LuaImplPackage, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.lua_dir_name = "lua"
         pass
 
diff --git a/var/spack/repos/builtin/packages/mesa/package.py b/var/spack/repos/builtin/packages/mesa/package.py
index 5e5d5d07b6..2f85cf3eca 100644
--- a/var/spack/repos/builtin/packages/mesa/package.py
+++ b/var/spack/repos/builtin/packages/mesa/package.py
@@ -153,7 +153,7 @@ class Mesa(MesonPackage):
         if self.spec.satisfies("%intel"):
             if name == "cflags":
                 flags.append("-std=c99")
-        return super(Mesa, self).flag_handler(name, flags)
+        return super().flag_handler(name, flags)
 
     @property
     def libglx_headers(self):
diff --git a/var/spack/repos/builtin/packages/mumax/package.py b/var/spack/repos/builtin/packages/mumax/package.py
index c302a71ec0..68948fc43a 100644
--- a/var/spack/repos/builtin/packages/mumax/package.py
+++ b/var/spack/repos/builtin/packages/mumax/package.py
@@ -57,7 +57,7 @@ class Mumax(MakefilePackage, CudaPackage):
         return join_path(self.gopath, "src/github.com/mumax/3")
 
     def do_stage(self, mirror_only=False):
-        super(Mumax, self).do_stage(mirror_only)
+        super().do_stage(mirror_only)
         if not os.path.exists(self.mumax_gopath_dir):
             # Need to move source to $GOPATH and then symlink the original
             # stage directory
diff --git a/var/spack/repos/builtin/packages/munge/package.py b/var/spack/repos/builtin/packages/munge/package.py
index b83c66eec3..0d9850b986 100644
--- a/var/spack/repos/builtin/packages/munge/package.py
+++ b/var/spack/repos/builtin/packages/munge/package.py
@@ -45,4 +45,4 @@ class Munge(AutotoolsPackage):
 
     def install(self, spec, prefix):
         os.makedirs(os.path.join(prefix, "lib/systemd/system"))
-        super(Munge, self).install(spec, prefix)
+        super().install(spec, prefix)
diff --git a/var/spack/repos/builtin/packages/openexr/package.py b/var/spack/repos/builtin/packages/openexr/package.py
index deea76d22f..36c6ede944 100644
--- a/var/spack/repos/builtin/packages/openexr/package.py
+++ b/var/spack/repos/builtin/packages/openexr/package.py
@@ -73,7 +73,7 @@ class Openexr(CMakePackage):
     @property
     def build_directory(self):
         if self.spec.satisfies("@3:"):
-            return super(Openexr, self).build_directory
+            return super().build_directory
         else:
             return "."
 
diff --git a/var/spack/repos/builtin/packages/openjpeg/package.py b/var/spack/repos/builtin/packages/openjpeg/package.py
index 19e1def3bc..e2bbfe233c 100644
--- a/var/spack/repos/builtin/packages/openjpeg/package.py
+++ b/var/spack/repos/builtin/packages/openjpeg/package.py
@@ -46,7 +46,7 @@ class Openjpeg(CMakePackage):
 
     def url_for_version(self, version):
         if version >= Version("2.1.1"):
-            return super(Openjpeg, self).url_for_version(version)
+            return super().url_for_version(version)
 
         # Before version 2.2.0, release tarballs of the versions like x.y.0
         # did not have the ".0" in their names:
diff --git a/var/spack/repos/builtin/packages/openloops/get-process-list.py b/var/spack/repos/builtin/packages/openloops/get-process-list.py
index b0641adb45..7f5f622181 100644
--- a/var/spack/repos/builtin/packages/openloops/get-process-list.py
+++ b/var/spack/repos/builtin/packages/openloops/get-process-list.py
@@ -8,7 +8,7 @@ class my_html_parser(HTMLParser):
         pass
 
     def __init__(self):
-        super(HTMLParser, self).__init__()
+        super().__init__()
         self.state = 0
         self.processes = []
 
diff --git a/var/spack/repos/builtin/packages/perl/package.py b/var/spack/repos/builtin/packages/perl/package.py
index dbe46cf350..de9961a545 100644
--- a/var/spack/repos/builtin/packages/perl/package.py
+++ b/var/spack/repos/builtin/packages/perl/package.py
@@ -207,7 +207,7 @@ class Perl(Package):  # Perl doesn't use Autotools, it should subclass Package
     # source and make everything writeable in the future.
     def do_stage(self, mirror_only=False):
         # Do Spack's regular stage
-        super(Perl, self).do_stage(mirror_only)
+        super().do_stage(mirror_only)
         # Add write permissions on file to be patched
         filename = join_path(self.stage.source_path, "pp.c")
         perm = os.stat(filename).st_mode
diff --git a/var/spack/repos/builtin/packages/photos-f/package.py b/var/spack/repos/builtin/packages/photos-f/package.py
index 2facf671c6..5c6cac9bf5 100644
--- a/var/spack/repos/builtin/packages/photos-f/package.py
+++ b/var/spack/repos/builtin/packages/photos-f/package.py
@@ -26,7 +26,7 @@ class PhotosF(MakefilePackage):
 
     def do_stage(self, mirror_only=False):
         # Fix directory structure - remove extra "<version>" subdirectory
-        super(PhotosF, self).do_stage(mirror_only)
+        super().do_stage(mirror_only)
         root = join_path(self.stage.source_path, self.spec.version)
         for fn in os.listdir(root):
             shutil.move(join_path(root, fn), self.stage.source_path)
diff --git a/var/spack/repos/builtin/packages/postgresql/package.py b/var/spack/repos/builtin/packages/postgresql/package.py
index 4f2c84b763..ed13a9dea8 100644
--- a/var/spack/repos/builtin/packages/postgresql/package.py
+++ b/var/spack/repos/builtin/packages/postgresql/package.py
@@ -101,7 +101,7 @@ class Postgresql(AutotoolsPackage):
                 with working_dir(os.path.join("src", subdir)):
                     make("install")
         else:
-            super(Postgresql, self).install(spec, prefix)
+            super().install(spec, prefix)
 
     def setup_run_environment(self, env):
         spec = self.spec
diff --git a/var/spack/repos/builtin/packages/py-keras/package.py b/var/spack/repos/builtin/packages/py-keras/package.py
index f96d066480..ba5ca20a2b 100644
--- a/var/spack/repos/builtin/packages/py-keras/package.py
+++ b/var/spack/repos/builtin/packages/py-keras/package.py
@@ -77,7 +77,7 @@ class PyKeras(PythonPackage):
 
     def url_for_version(self, version):
         if version >= Version("2.6"):
-            return super(PyKeras, self).url_for_version(version)
+            return super().url_for_version(version)
         else:
             url = "https://pypi.io/packages/source/K/Keras/Keras-{0}.tar.gz"
             return url.format(version.dotted)
diff --git a/var/spack/repos/builtin/packages/py-pybind11/package.py b/var/spack/repos/builtin/packages/py-pybind11/package.py
index 03451ac721..1dc422793c 100644
--- a/var/spack/repos/builtin/packages/py-pybind11/package.py
+++ b/var/spack/repos/builtin/packages/py-pybind11/package.py
@@ -89,7 +89,7 @@ class CMakeBuilder(spack.build_systems.cmake.CMakeBuilder):
         ]
 
     def install(self, pkg, spec, prefix):
-        super(CMakeBuilder, self).install(pkg, spec, prefix)
+        super().install(pkg, spec, prefix)
         python_builder = spack.build_systems.python.PythonPipBuilder(pkg)
         python_builder.install(pkg, spec, prefix)
 
diff --git a/var/spack/repos/builtin/packages/py-sip/package.py b/var/spack/repos/builtin/packages/py-sip/package.py
index c469a26fe0..031c04ca8b 100644
--- a/var/spack/repos/builtin/packages/py-sip/package.py
+++ b/var/spack/repos/builtin/packages/py-sip/package.py
@@ -54,7 +54,7 @@ class PySip(PythonPackage):
             return "https://www.riverbankcomputing.com/hg/sip/archive/{0}.tar.gz".format(
                 version.dotted
             )
-        return super(PySip, self).url_for_version(version)
+        return super().url_for_version(version)
 
     @when("@:4")
     def install(self, spec, prefix):
diff --git a/var/spack/repos/builtin/packages/raja/package.py b/var/spack/repos/builtin/packages/raja/package.py
index f1f11c12d8..5483cbdfcc 100644
--- a/var/spack/repos/builtin/packages/raja/package.py
+++ b/var/spack/repos/builtin/packages/raja/package.py
@@ -109,14 +109,14 @@ class Raja(CachedCMakePackage, CudaPackage, ROCmPackage):
 
     def initconfig_compiler_entries(self):
         spec = self.spec
-        entries = super(Raja, self).initconfig_compiler_entries()
+        entries = super().initconfig_compiler_entries()
         if "+rocm" in spec:
             entries.insert(0, cmake_cache_path("CMAKE_CXX_COMPILER", spec["hip"].hipcc))
         return entries
 
     def initconfig_hardware_entries(self):
         spec = self.spec
-        entries = super(Raja, self).initconfig_hardware_entries()
+        entries = super().initconfig_hardware_entries()
 
         entries.append(cmake_cache_option("ENABLE_OPENMP", "+openmp" in spec))
 
diff --git a/var/spack/repos/builtin/packages/sed/package.py b/var/spack/repos/builtin/packages/sed/package.py
index 80341745ea..3cc60384d7 100644
--- a/var/spack/repos/builtin/packages/sed/package.py
+++ b/var/spack/repos/builtin/packages/sed/package.py
@@ -28,7 +28,7 @@ class Sed(AutotoolsPackage, GNUMirrorPackage):
             self.gnu_mirror_path = "sed/sed-{0}.tar.bz2".format(version)
         elif version < Version("4.2"):
             self.gnu_mirror_path = "sed/sed-{0}.tar.gz".format(version)
-        return super(Sed, self).url_for_version(version)
+        return super().url_for_version(version)
 
     @classmethod
     def determine_version(cls, exe):
diff --git a/var/spack/repos/builtin/packages/singularityce/package.py b/var/spack/repos/builtin/packages/singularityce/package.py
index 8ba8261c60..f6e05aa143 100644
--- a/var/spack/repos/builtin/packages/singularityce/package.py
+++ b/var/spack/repos/builtin/packages/singularityce/package.py
@@ -53,7 +53,7 @@ class SingularityBase(MakefilePackage):
     # Unpack the tarball as usual, then move the src dir into
     # its home within GOPATH.
     def do_stage(self, mirror_only=False):
-        super(SingularityBase, self).do_stage(mirror_only)
+        super().do_stage(mirror_only)
         if not os.path.exists(self.singularity_gopath_dir):
             # Move the expanded source to its destination
             tty.debug(
diff --git a/var/spack/repos/builtin/packages/spectre/package.py b/var/spack/repos/builtin/packages/spectre/package.py
index 407c65609d..c183b63b8a 100644
--- a/var/spack/repos/builtin/packages/spectre/package.py
+++ b/var/spack/repos/builtin/packages/spectre/package.py
@@ -347,9 +347,7 @@ class Spectre(CMakePackage):
     @property
     def archive_files(self):
         # Archive the `BuildInfo.txt` file for debugging builds
-        return super(Spectre, self).archive_files + [
-            join_path(self.build_directory, "BuildInfo.txt")
-        ]
+        return super().archive_files + [join_path(self.build_directory, "BuildInfo.txt")]
 
     def check(self):
         with working_dir(self.build_directory):
diff --git a/var/spack/repos/builtin/packages/srcml-identifier-getter-tool/package.py b/var/spack/repos/builtin/packages/srcml-identifier-getter-tool/package.py
index b4ce139cd7..3e442f1729 100644
--- a/var/spack/repos/builtin/packages/srcml-identifier-getter-tool/package.py
+++ b/var/spack/repos/builtin/packages/srcml-identifier-getter-tool/package.py
@@ -21,6 +21,6 @@ class SrcmlIdentifierGetterTool(CMakePackage):
     depends_on("lzma")
 
     def install(self, spec, prefix):
-        super(SrcmlIdentifierGetterTool, self).install(spec, prefix)
+        super().install(spec, prefix)
         mkdir(prefix.bin)
         install(join_path(self.build_directory, "bin", "grabidentifiers"), prefix.bin)
diff --git a/var/spack/repos/builtin/packages/turbomole/package.py b/var/spack/repos/builtin/packages/turbomole/package.py
index 5bafb02ad0..9222f04dcd 100644
--- a/var/spack/repos/builtin/packages/turbomole/package.py
+++ b/var/spack/repos/builtin/packages/turbomole/package.py
@@ -44,7 +44,7 @@ class Turbomole(Package):
     def do_fetch(self, mirror_only=True):
         if "+mpi" in self.spec and "+smp" in self.spec:
             raise InstallError("Can not have both SMP and MPI enabled in the " "same build.")
-        super(Turbomole, self).do_fetch(mirror_only)
+        super().do_fetch(mirror_only)
 
     def get_tm_arch(self):
         if "TURBOMOLE" in os.getcwd():
diff --git a/var/spack/repos/builtin/packages/umpire/package.py b/var/spack/repos/builtin/packages/umpire/package.py
index a3e6e066e0..a69bd3c85d 100644
--- a/var/spack/repos/builtin/packages/umpire/package.py
+++ b/var/spack/repos/builtin/packages/umpire/package.py
@@ -147,7 +147,7 @@ class Umpire(CachedCMakePackage, CudaPackage, ROCmPackage):
 
     def initconfig_compiler_entries(self):
         spec = self.spec
-        entries = super(Umpire, self).initconfig_compiler_entries()
+        entries = super().initconfig_compiler_entries()
 
         if "+rocm" in spec:
             entries.insert(0, cmake_cache_path("CMAKE_CXX_COMPILER", spec["hip"].hipcc))
@@ -165,7 +165,7 @@ class Umpire(CachedCMakePackage, CudaPackage, ROCmPackage):
 
     def initconfig_hardware_entries(self):
         spec = self.spec
-        entries = super(Umpire, self).initconfig_hardware_entries()
+        entries = super().initconfig_hardware_entries()
 
         option_prefix = "UMPIRE_" if spec.satisfies("@2022.03.0:") else ""
 
diff --git a/var/spack/repos/tutorial/packages/netlib-lapack/package.py b/var/spack/repos/tutorial/packages/netlib-lapack/package.py
index bfc134b5c7..96925d3117 100644
--- a/var/spack/repos/tutorial/packages/netlib-lapack/package.py
+++ b/var/spack/repos/tutorial/packages/netlib-lapack/package.py
@@ -170,19 +170,19 @@ class NetlibLapack(CMakePackage):
     @when("+shared")
     def cmake(self, spec, prefix):
         for self._building_shared in (False, True):
-            super(NetlibLapack, self).cmake(spec, prefix)
+            super().cmake(spec, prefix)
 
     @when("+shared")
     def build(self, spec, prefix):
         for self._building_shared in (False, True):
-            super(NetlibLapack, self).build(spec, prefix)
+            super().build(spec, prefix)
 
     @when("+shared")
     def install(self, spec, prefix):
         for self._building_shared in (False, True):
-            super(NetlibLapack, self).install(spec, prefix)
+            super().install(spec, prefix)
 
     @when("+shared")
     def check(self):
         for self._building_shared in (False, True):
-            super(NetlibLapack, self).check()
+            super().check()
-- 
cgit v1.2.3-70-g09d2