diff --git a/lib/spack/spack/directory_layout.py b/lib/spack/spack/directory_layout.py
index 36501477d0f1349a5b414fa1f2ef63714ce4232f..bfeeeec2d8773f67426560c4c12a20aa93ae7d60 100644
--- a/lib/spack/spack/directory_layout.py
+++ b/lib/spack/spack/directory_layout.py
@@ -7,7 +7,6 @@
 import shutil
 import glob
 import tempfile
-import re
 from contextlib import contextmanager
 
 import ruamel.yaml as yaml
diff --git a/lib/spack/spack/schema/config.py b/lib/spack/spack/schema/config.py
index 4e501bb9a34b42da591809beccda7fdbf223ee7d..69b85faa804901ebca5b1848892756ab8339b650 100644
--- a/lib/spack/spack/schema/config.py
+++ b/lib/spack/spack/schema/config.py
@@ -30,7 +30,7 @@
                             spack.schema.projections.properties,
                         ),
                     },
-                    {'type': 'string',}
+                    {'type': 'string'}
                 ],
             },
             'install_hash_length': {'type': 'integer', 'minimum': 1},
diff --git a/lib/spack/spack/store.py b/lib/spack/spack/store.py
index bee342a4261c35354a2dcc72a88ce86b5ec9aa9a..756a0a2e03dc2cbd3f9c96d37ff4668c31d48d72 100644
--- a/lib/spack/spack/store.py
+++ b/lib/spack/spack/store.py
@@ -24,7 +24,6 @@
 
 """
 import os
-import re
 import six
 
 import llnl.util.lang
diff --git a/lib/spack/spack/test/directory_layout.py b/lib/spack/spack/test/directory_layout.py
index 213b835a051daefc7a143744574d55f2449b1846..3a144621eb8007671b31d334af41d0755a3200a4 100644
--- a/lib/spack/spack/test/directory_layout.py
+++ b/lib/spack/spack/test/directory_layout.py
@@ -68,8 +68,8 @@ def test_yaml_directory_layout_parameters(tmpdir, config):
     ns_scheme = "${ARCHITECTURE}/${NAMESPACE}/${PACKAGE}-${VERSION}-${HASH:7}"   # NOQA: ignore=E501
     arch_ns_scheme_projections = {'all': arch_scheme,
                                   'python': ns_scheme}
-    layout_arch_ns = YamlDirectoryLayout(str(tmpdir),
-                                         projections=arch_ns_scheme_projections)
+    layout_arch_ns = YamlDirectoryLayout(
+        str(tmpdir), projections=arch_ns_scheme_projections)
 
     arch_path_spec2 = layout_arch_ns.relative_path_for_spec(spec2)
     assert(arch_path_spec2 == spec2.format(arch_scheme))
diff --git a/lib/spack/spack/test/util/spack_yaml.py b/lib/spack/spack/test/util/spack_yaml.py
index 3ae0505a98045df13e579d6b1eca381ad27a50d3..23e02d7be6f0eb0d112e67aae073d5661a3899de 100644
--- a/lib/spack/spack/test/util/spack_yaml.py
+++ b/lib/spack/spack/test/util/spack_yaml.py
@@ -13,7 +13,7 @@
 
 def get_config_line(pattern, lines):
     """Get a configuration line that matches a particular pattern."""
-    line = next((l for l in lines if re.search(pattern, l)), None)
+    line = next((x for x in lines if re.search(pattern, x)), None)
     assert line is not None, 'no such line!'
     return line