diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2018-07-30 14:47:51 -0700 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2018-11-09 00:31:24 -0800 |
| commit | cd075b04d2d8e06e5da5d685ce51103b02f7fb46 (patch) | |
| tree | 594f35553c284d255ee4e5a5ae2ce18fd199529b | |
| parent | b738b7b05b90119ed4ab8b80e56747e367d04f02 (diff) | |
| download | spack-cd075b04d2d8e06e5da5d685ce51103b02f7fb46.tar.gz spack-cd075b04d2d8e06e5da5d685ce51103b02f7fb46.tar.bz2 spack-cd075b04d2d8e06e5da5d685ce51103b02f7fb46.tar.xz spack-cd075b04d2d8e06e5da5d685ce51103b02f7fb46.zip | |
env: refactor imports in cmd/env.py and tests
| -rw-r--r-- | lib/spack/spack/cmd/env.py | 21 | ||||
| -rw-r--r-- | lib/spack/spack/test/cmd/env.py | 6 |
2 files changed, 11 insertions, 16 deletions
diff --git a/lib/spack/spack/cmd/env.py b/lib/spack/spack/cmd/env.py index 3a38da9590..2c61c668ef 100644 --- a/lib/spack/spack/cmd/env.py +++ b/lib/spack/spack/cmd/env.py @@ -3,9 +3,13 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -import llnl.util.tty as tty -import spack -import llnl.util.filesystem as fs +import os +import sys +import shutil +import argparse +from contextlib import contextmanager +from six.moves import zip_longest + import spack.modules import spack.util.spack_json as sjson import spack.util.spack_yaml as syaml @@ -20,16 +24,9 @@ from spack.config import ConfigScope from spack.spec import Spec, CompilerSpec, FlagMap from spack.repo import Repo from spack.version import VersionList -from contextlib import contextmanager -import argparse -try: - from itertools import izip_longest as zip_longest -except ImportError: - from itertools import zip_longest -import os -import sys -import shutil +import llnl.util.tty as tty +import llnl.util.filesystem as fs description = "group a subset of packages" section = "environment" diff --git a/lib/spack/spack/test/cmd/env.py b/lib/spack/spack/test/cmd/env.py index dbb3aa9f1f..fddbfa789c 100644 --- a/lib/spack/spack/test/cmd/env.py +++ b/lib/spack/spack/test/cmd/env.py @@ -6,11 +6,9 @@ import unittest import tempfile import shutil +from six import StringIO + import pytest -try: - from StringIO import StringIO -except ImportError: - from io import StringIO import spack.cmd.env import spack.modules |