diff --git a/var/spack/repos/builtin/packages/py-Genshi/package.py b/var/spack/repos/builtin/packages/py-Genshi/package.py
index 6feb4a5bcf1..7e0629200eb 100644
--- a/var/spack/repos/builtin/packages/py-Genshi/package.py
+++ b/var/spack/repos/builtin/packages/py-Genshi/package.py
@@ -1,13 +1,15 @@
-from spack import *
+from spack import version, extends, depends_on, python
+from spack import Package
+
 
 class PyGenshi(Package):
     """Python toolkit for generation of output for the web"""
     homepage = "https://genshi.edgewall.org/"
     url      = "http://ftp.edgewall.com/pub/genshi/Genshi-0.7.tar.gz"
 
-    version('0.7'  , '54e64dd69da3ec961f86e686e0848a82')
+    version('0.7', '54e64dd69da3ec961f86e686e0848a82')
     version('0.6.1', '372c368c8931110b0a521fa6091742d7')
-    version('0.6'  , '604e8b23b4697655d36a69c2d8ef7187')
+    version('0.6', '604e8b23b4697655d36a69c2d8ef7187')
 
     extends("python")
     depends_on("py-setuptools")
diff --git a/var/spack/repos/builtin/packages/py-astroid/package.py b/var/spack/repos/builtin/packages/py-astroid/package.py
index 0c7971b27c2..a8420d86c4f 100644
--- a/var/spack/repos/builtin/packages/py-astroid/package.py
+++ b/var/spack/repos/builtin/packages/py-astroid/package.py
@@ -1,4 +1,6 @@
-from spack import *
+from spack import depends_on, extends, python, version
+from spack import Package
+
 
 class PyAstroid(Package):
     homepage = "https://www.astroid.org/"
diff --git a/var/spack/repos/builtin/packages/py-jinja2/package.py b/var/spack/repos/builtin/packages/py-jinja2/package.py
index bf1fcb74d2e..a7458777867 100644
--- a/var/spack/repos/builtin/packages/py-jinja2/package.py
+++ b/var/spack/repos/builtin/packages/py-jinja2/package.py
@@ -1,25 +1,27 @@
-from spack import *
+from spack import depends_on, extends, python, version
+from spack import Package
+
 
 class PyJinja2(Package):
     """
     Jinja2 is a template engine written in pure Python. It provides
-    a Django inspired non-XML syntax but supports inline expressions 
+    a Django inspired non-XML syntax but supports inline expressions
     and an optional sandboxed environment.
     """
 
     homepage = "http://jinja.pocoo.org/"
     url      = "https://github.com/pallets/jinja/archive/2.8.tar.gz"
 
-    version('2.8'  , '4114200650d7630594e3bc70af23f59e')
+    version('2.8', '4114200650d7630594e3bc70af23f59e')
     version('2.7.3', '55b87bdc8e585b8b5b86734eefce2621')
     version('2.7.2', '8e8f226809ae6363009b9296e30adf30')
     version('2.7.1', '69b6675553c81b1087f95cae7f2179bb')
-    version('2.7'  , 'ec70433f325051dcedacbb2465028a35')
+    version('2.7', 'ec70433f325051dcedacbb2465028a35')
 
     extends("python")
     depends_on("py-setuptools")
     depends_on("py-markupsafe")
-    
+
     def install(self, spec, prefix):
         python('setup.py', 'install', '--prefix=%s' % prefix)
 
diff --git a/var/spack/repos/builtin/packages/py-logilab-common/package.py b/var/spack/repos/builtin/packages/py-logilab-common/package.py
index 2cbe7abcef0..5b3c6e26cce 100644
--- a/var/spack/repos/builtin/packages/py-logilab-common/package.py
+++ b/var/spack/repos/builtin/packages/py-logilab-common/package.py
@@ -1,4 +1,6 @@
-from spack import *
+from spack import depends_on, extends, python, version
+from spack import Package
+
 
 class PyLogilabCommon(Package):
     """Common modules used by Logilab projects"""
diff --git a/var/spack/repos/builtin/packages/py-markupsafe/package.py b/var/spack/repos/builtin/packages/py-markupsafe/package.py
index 78cbdd7a99f..ac55e5ae287 100644
--- a/var/spack/repos/builtin/packages/py-markupsafe/package.py
+++ b/var/spack/repos/builtin/packages/py-markupsafe/package.py
@@ -1,13 +1,15 @@
-from spack import *
+from spack import depends_on, extends, python, version
+from spack import Package
+
 
 class PyMarkupsafe(Package):
     """
-    MarkupSafe is a library for Python that implements a unicode 
-    string that is aware of HTML escaping rules and can be used 
+    MarkupSafe is a library for Python that implements a unicode
+    string that is aware of HTML escaping rules and can be used
     to implement automatic string escaping. It is used by Jinja 2,
     the Mako templating engine, the Pylons web framework and many more.
     """
-    
+
     homepage = "http://www.pocoo.org/projects/markupsafe/"
     url      = "https://github.com/pallets/markupsafe/archive/0.23.tar.gz"
 
diff --git a/var/spack/repos/builtin/packages/py-mistune/package.py b/var/spack/repos/builtin/packages/py-mistune/package.py
index 4a9d5b5eb47..aacd921d7bc 100644
--- a/var/spack/repos/builtin/packages/py-mistune/package.py
+++ b/var/spack/repos/builtin/packages/py-mistune/package.py
@@ -1,4 +1,6 @@
-from spack import *
+from spack import depends_on, extends, python, version
+from spack import Package
+
 
 class PyMistune(Package):
     """
@@ -8,10 +10,10 @@ class PyMistune(Package):
     url      = "https://github.com/lepture/mistune/archive/v0.7.1.tar.gz"
 
     version('0.7.1', '0d9c29700c670790c5b2471070d32ec2')
-    version('0.7'  , '77750ae8b8d0d584894224a7e0c0523a')
-    version('0.6'  , 'd4f3d4f28a69e715f82b591d5dacf9a6')
+    version('0.7', '77750ae8b8d0d584894224a7e0c0523a')
+    version('0.6', 'd4f3d4f28a69e715f82b591d5dacf9a6')
     version('0.5.1', '1c6cfce28a4aa90cf125217cd6c6fe6c')
-    version('0.5'  , '997736554f1f95eea78c66ae339b5722')
+    version('0.5', '997736554f1f95eea78c66ae339b5722')
 
     extends('python')
     depends_on('py-setuptools')
diff --git a/var/spack/repos/builtin/packages/py-prettytable/package.py b/var/spack/repos/builtin/packages/py-prettytable/package.py
index 2f7577d8c43..1adfba3d1b0 100644
--- a/var/spack/repos/builtin/packages/py-prettytable/package.py
+++ b/var/spack/repos/builtin/packages/py-prettytable/package.py
@@ -1,9 +1,11 @@
-from spack import *
+from spack import depends_on, extends, python, version
+from Spack import Package
+
 
 class PyPrettytable(Package):
     """
     PrettyTable is a simple Python library designed to make
-    it quick and easy to represent tabular data in visually 
+    it quick and easy to represent tabular data in visually
     appealing ASCII tables
     """
     homepage = "https://code.google.com/archive/p/prettytable/"
@@ -13,6 +15,6 @@ class PyPrettytable(Package):
 
     extends("python")
     depends_on("py-setuptools")
-    
+
     def install(self, spec, prefix):
         python('setup.py', 'install', '--prefix=%s' % prefix)
diff --git a/var/spack/repos/builtin/packages/py-py2neo/package.py b/var/spack/repos/builtin/packages/py-py2neo/package.py
index c9cfdade2cb..1697bdb0ee4 100644
--- a/var/spack/repos/builtin/packages/py-py2neo/package.py
+++ b/var/spack/repos/builtin/packages/py-py2neo/package.py
@@ -1,4 +1,6 @@
-from spack import *
+from spack import depends_on, extends, python, version
+from spack import Package
+
 
 class PyPy2neo(Package):
     """FIXME: put a proper description of your package here."""
diff --git a/var/spack/repos/builtin/packages/py-storm/package.py b/var/spack/repos/builtin/packages/py-storm/package.py
index d504b231d48..1953f285c41 100644
--- a/var/spack/repos/builtin/packages/py-storm/package.py
+++ b/var/spack/repos/builtin/packages/py-storm/package.py
@@ -1,4 +1,6 @@
-from spack import *
+from spack import depends_on, extends, python, version
+from spack import Package
+
 
 class PyStorm(Package):
     """Storm is an object-relational mapper (ORM) for Python"""
@@ -12,4 +14,3 @@ class PyStorm(Package):
 
     def install(self, spec, prefix):
         python('setup.py', 'install', '--prefix=%s' % prefix)
-