diff options
Diffstat (limited to 'lib/spack/spack/cray_manifest.py')
| -rw-r--r-- | lib/spack/spack/cray_manifest.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/spack/spack/cray_manifest.py b/lib/spack/spack/cray_manifest.py index 631280c473..66dd33ce7c 100644 --- a/lib/spack/spack/cray_manifest.py +++ b/lib/spack/spack/cray_manifest.py @@ -7,7 +7,6 @@ import json import jsonschema import jsonschema.exceptions -import six import llnl.util.tty as tty @@ -97,7 +96,7 @@ def spec_from_entry(entry): continue # Value could be a list (of strings), boolean, or string - if isinstance(value, six.string_types): + if isinstance(value, str): variant_strs.append("{0}={1}".format(name, value)) else: try: @@ -169,10 +168,7 @@ def read(path, apply_updates): jsonschema.validate(json_data, manifest_schema) except (jsonschema.exceptions.ValidationError, decode_exception_type) as e: - raise six.raise_from( - ManifestValidationError("error parsing manifest JSON:", str(e)), - e, - ) + raise ManifestValidationError("error parsing manifest JSON:", str(e)) from e specs = entries_to_specs(json_data["specs"]) tty.debug("{0}: {1} specs read from manifest".format(path, str(len(specs)))) |