From 6e31676b29118b1d8eb7ce63a1dc9dc94a8489b6 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Mon, 14 Aug 2023 18:38:59 +0200 Subject: Fix style issues with latest versions of tools (#39422) --- lib/spack/llnl/util/tty/log.py | 2 +- lib/spack/spack/config.py | 2 +- lib/spack/spack/multimethod.py | 2 +- lib/spack/spack/test/cmd/build_env.py | 2 +- lib/spack/spack/test/llnl/util/file_list.py | 12 ++++++------ lib/spack/spack/test/sbang.py | 1 - lib/spack/spack/test/spec_semantics.py | 8 ++++---- lib/spack/spack/test/variant.py | 6 +++--- lib/spack/spack/util/spack_yaml.py | 2 +- lib/spack/spack/util/string.py | 2 +- 10 files changed, 19 insertions(+), 20 deletions(-) (limited to 'lib') diff --git a/lib/spack/llnl/util/tty/log.py b/lib/spack/llnl/util/tty/log.py index f352d33ae5..8f685442a2 100644 --- a/lib/spack/llnl/util/tty/log.py +++ b/lib/spack/llnl/util/tty/log.py @@ -780,7 +780,7 @@ class winlog: raise RuntimeError("file argument must be set by __init__ ") # Open both write and reading on logfile - if type(self.logfile) == io.StringIO: + if isinstance(self.logfile, io.StringIO): self._ioflag = True # cannot have two streams on tempfile, so we must make our own sys.stdout = self.logfile diff --git a/lib/spack/spack/config.py b/lib/spack/spack/config.py index 9df6eead82..5035e2c0ed 100644 --- a/lib/spack/spack/config.py +++ b/lib/spack/spack/config.py @@ -430,7 +430,7 @@ class Configuration: return [ s for s in self.scopes.values() - if (type(s) == ConfigScope or type(s) == SingleFileScope) + if (type(s) is ConfigScope or type(s) is SingleFileScope) ] def highest_precedence_scope(self) -> ConfigScope: diff --git a/lib/spack/spack/multimethod.py b/lib/spack/spack/multimethod.py index c268b6caba..d3453beb79 100644 --- a/lib/spack/spack/multimethod.py +++ b/lib/spack/spack/multimethod.py @@ -236,7 +236,7 @@ class when: # Create a multimethod with this name if there is not one already original_method = MultiMethodMeta._locals.get(method.__name__) - if not type(original_method) == SpecMultiMethod: + if not isinstance(original_method, SpecMultiMethod): original_method = SpecMultiMethod(original_method) if self.spec is not None: diff --git a/lib/spack/spack/test/cmd/build_env.py b/lib/spack/spack/test/cmd/build_env.py index c27b292cb1..286fcd5e11 100644 --- a/lib/spack/spack/test/cmd/build_env.py +++ b/lib/spack/spack/test/cmd/build_env.py @@ -54,7 +54,7 @@ def test_pickle(tmpdir): with tmpdir.as_cwd(): build_env("--pickle", _out_file, "zlib") environment = pickle.load(open(_out_file, "rb")) - assert type(environment) == dict + assert isinstance(environment, dict) assert "PATH" in environment diff --git a/lib/spack/spack/test/llnl/util/file_list.py b/lib/spack/spack/test/llnl/util/file_list.py index b1574db713..425ce641bd 100644 --- a/lib/spack/spack/test/llnl/util/file_list.py +++ b/lib/spack/spack/test/llnl/util/file_list.py @@ -134,7 +134,7 @@ class TestLibraryList: assert a == "/dir1/liblapack.%s" % plat_static_ext b = library_list[:] - assert type(b) == type(library_list) + assert type(b) is type(library_list) assert library_list == b assert library_list is not b @@ -152,8 +152,8 @@ class TestLibraryList: assert both == both + both # Always produce an instance of LibraryList - assert type(library_list + pylist) == type(library_list) - assert type(pylist + library_list) == type(library_list) + assert type(library_list + pylist) is type(library_list) + assert type(pylist + library_list) is type(library_list) class TestHeaderList: @@ -219,7 +219,7 @@ class TestHeaderList: assert a == "/dir1/Python.h" b = header_list[:] - assert type(b) == type(header_list) + assert type(b) is type(header_list) assert header_list == b assert header_list is not b @@ -237,8 +237,8 @@ class TestHeaderList: assert h == h + h # Always produce an instance of HeaderList - assert type(header_list + pylist) == type(header_list) - assert type(pylist + header_list) == type(header_list) + assert type(header_list + pylist) is type(header_list) + assert type(pylist + header_list) is type(header_list) #: Directory where the data for the test below is stored diff --git a/lib/spack/spack/test/sbang.py b/lib/spack/spack/test/sbang.py index a1a37ed415..8d7e50ee34 100644 --- a/lib/spack/spack/test/sbang.py +++ b/lib/spack/spack/test/sbang.py @@ -53,7 +53,6 @@ php_in_text = ("line\n") * 100 + "php\n" + ("line\n" * 100) php_line_patched = "\n" -sbang_line = "#!/bin/sh %s/bin/sbang\n" % spack.store.STORE.unpadded_root last_line = "last!\n" diff --git a/lib/spack/spack/test/spec_semantics.py b/lib/spack/spack/test/spec_semantics.py index 02ddc360f0..efe788bce3 100644 --- a/lib/spack/spack/test/spec_semantics.py +++ b/lib/spack/spack/test/spec_semantics.py @@ -515,10 +515,10 @@ class TestSpecSemantics: s.normalize() assert s["callpath"] == s - assert type(s["dyninst"]) == Spec - assert type(s["libdwarf"]) == Spec - assert type(s["libelf"]) == Spec - assert type(s["mpi"]) == Spec + assert isinstance(s["dyninst"], Spec) + assert isinstance(s["libdwarf"], Spec) + assert isinstance(s["libelf"], Spec) + assert isinstance(s["mpi"], Spec) assert s["dyninst"].name == "dyninst" assert s["libdwarf"].name == "libdwarf" diff --git a/lib/spack/spack/test/variant.py b/lib/spack/spack/test/variant.py index ac6525f748..517197654c 100644 --- a/lib/spack/spack/test/variant.py +++ b/lib/spack/spack/test/variant.py @@ -525,13 +525,13 @@ class TestBoolValuedVariant: def test_from_node_dict(): a = MultiValuedVariant.from_node_dict("foo", ["bar"]) - assert type(a) == MultiValuedVariant + assert type(a) is MultiValuedVariant a = MultiValuedVariant.from_node_dict("foo", "bar") - assert type(a) == SingleValuedVariant + assert type(a) is SingleValuedVariant a = MultiValuedVariant.from_node_dict("foo", "true") - assert type(a) == BoolValuedVariant + assert type(a) is BoolValuedVariant class TestVariant: diff --git a/lib/spack/spack/util/spack_yaml.py b/lib/spack/spack/util/spack_yaml.py index f0cb05ab04..2ca9acbed7 100644 --- a/lib/spack/spack/util/spack_yaml.py +++ b/lib/spack/spack/util/spack_yaml.py @@ -68,7 +68,7 @@ def syaml_type(obj): """ for syaml_t, t in syaml_types.items(): if type(obj) is not bool and isinstance(obj, t): - return syaml_t(obj) if type(obj) != syaml_t else obj + return syaml_t(obj) if type(obj) is not syaml_t else obj return obj diff --git a/lib/spack/spack/util/string.py b/lib/spack/spack/util/string.py index 1c88c17777..03dc2bb850 100644 --- a/lib/spack/spack/util/string.py +++ b/lib/spack/spack/util/string.py @@ -5,7 +5,7 @@ def comma_list(sequence, article=""): - if type(sequence) != list: + if type(sequence) is not list: sequence = list(sequence) if not sequence: -- cgit v1.2.3-60-g2f50