diff --git a/var/spack/repos/builtin/packages/py-Genshi/package.py b/var/spack/repos/builtin/packages/py-Genshi/package.py
index 6feb4a5bcf1854ed16b3865491eebc3aa63d2285..7e0629200ebd12e2a91ee55a37b6fd2c42629323 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 0c7971b27c25491b6932b94f8fecb55212a51d04..a8420d86c4fd7409c662f482290f1af314dfec17 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 bf1fcb74d2e843c08530f05bcc2a401674793c71..a7458777867aa350b35f5fe78300956a400ba4f8 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 2cbe7abcef0e252b20268533d9d6a18073d3086f..5b3c6e26cce69524f603ef2b9a35af804ea62db2 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 78cbdd7a99f4f9ffaf9da3fc0c0fb0efdce96bb2..ac55e5ae28782e69111abfaa97f9dc224f3aeb61 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 4a9d5b5eb475d12eb1907085ee6d5d9371cfc860..aacd921d7bca465c92a7937527422dfb59748792 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 2f7577d8c4376c41ef9fde579e469c1df0f919d2..1adfba3d1b06c767d2c4f479b0fb7d8794825250 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 c9cfdade2cbf76df1ced80107850cd79c59771f6..1697bdb0ee43d2970bac3f8ee0a043c043587147 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 d504b231d48e5f7ce69ab643947cafe5ea67d308..1953f285c412895adf2e20a1fd66a95a58ced2b0 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)
-