summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorTodd Gamblin <tgamblin@llnl.gov>2016-06-26 22:41:58 -0700
committerGitHub <noreply@github.com>2016-06-26 22:41:58 -0700
commitece72e5337c15039b8868ed4ade8fd0e7fa8abf3 (patch)
tree9cb97db785e0d555497f04a7ec34684a46c8aa5e /lib
parentbad32724ecc222077b2c8112ae1df8d03f3cbd84 (diff)
parent4952c4c7def96caef2b47160f8b9e08392ae348d (diff)
downloadspack-ece72e5337c15039b8868ed4ade8fd0e7fa8abf3.tar.gz
spack-ece72e5337c15039b8868ed4ade8fd0e7fa8abf3.tar.bz2
spack-ece72e5337c15039b8868ed4ade8fd0e7fa8abf3.tar.xz
spack-ece72e5337c15039b8868ed4ade8fd0e7fa8abf3.zip
Merge pull request #1030 from opoplawski/external
Remove last two remaining from external imports
Diffstat (limited to 'lib')
-rw-r--r--lib/spack/spack/cmd/repo.py2
-rw-r--r--lib/spack/spack/repository.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/spack/spack/cmd/repo.py b/lib/spack/spack/cmd/repo.py
index 399237b169..cbd8f4784e 100644
--- a/lib/spack/spack/cmd/repo.py
+++ b/lib/spack/spack/cmd/repo.py
@@ -26,7 +26,7 @@ import os
import re
import shutil
-from external import argparse
+import argparse
import llnl.util.tty as tty
from llnl.util.filesystem import join_path, mkdirp
diff --git a/lib/spack/spack/repository.py b/lib/spack/spack/repository.py
index 70134964ad..2c160a5f45 100644
--- a/lib/spack/spack/repository.py
+++ b/lib/spack/spack/repository.py
@@ -30,7 +30,7 @@ import imp
import re
import traceback
from bisect import bisect_left
-from external import yaml
+import yaml
import llnl.util.tty as tty
from llnl.util.filesystem import *