Make subcommands importable, '-' -> '_', fixes #1642

4 files changed, 1 insertions, 5 deletions

diff --git a/lib/spack/spack/cmd/package-list.py b/lib/spack/spack/cmd/package_list.py
index 42f408af96..42f408af96 100644
--- a/lib/spack/spack/cmd/package-list.py
+++ b/lib/spack/spack/cmd/package_list.py
diff --git a/lib/spack/spack/cmd/test-install.py b/lib/spack/spack/cmd/test_install.py
index 8e7173e9a2..8e7173e9a2 100644
--- a/lib/spack/spack/cmd/test-install.py
+++ b/lib/spack/spack/cmd/test_install.py
diff --git a/lib/spack/spack/cmd/url-parse.py b/lib/spack/spack/cmd/url_parse.py
index b8c7c95040..b8c7c95040 100644
--- a/lib/spack/spack/cmd/url-parse.py
+++ b/lib/spack/spack/cmd/url_parse.py
diff --git a/lib/spack/spack/test/cmd/test_install.py b/lib/spack/spack/test/cmd/test_install.py
index 39287d5d6d..4734fe1267 100644
--- a/lib/spack/spack/test/cmd/test_install.py
+++ b/lib/spack/spack/test/cmd/test_install.py
@@ -30,6 +30,7 @@ import contextlib
 
 import spack
 import spack.cmd
+from spack.cmd import test_install
 
 FILE_REGISTRY = collections.defaultdict(StringIO.StringIO)
 
@@ -51,11 +52,6 @@ def mock_open(filename, mode):
         handle.close()
 
 
-# The use of __import__ is necessary to maintain a name with hyphen (which
-# cannot be an identifier in python)
-test_install = __import__("spack.cmd.test-install", fromlist=['test_install'])
-
-
 class MockSpec(object):
 
     def __init__(self, name, version, hashStr=None):