pep8 fixes

Author: gartung

lib/spack/spack/binary_distribution.py

@@ -2,6 +2,7 @@
 # "Patrick Gartung (FNAL)"
 
 import os
+import re
 import platform
 import tarfile
 import yaml
@@ -17,8 +18,6 @@
 import spack.fetch_strategy as fs
 import spack.relocate
 from contextlib import closing
-import platform
-import re
 
 
 def prepare():
@@ -175,8 +174,8 @@ def build_tarball(spec, outdir, force=False, rel=False, key=None):
     # Sign the packages.
     # spack gpg sign [--key key] tarfile_path
     # spack gpg sign [--key key] tarfile_path + '/spec.yaml'
-    # if key == None:
-    #    keys = Gpg.signing_keys()
+    if key == None:
+        keys = Gpg.signing_keys()
     #    if len(keys) == 1:
     #        key = keys[0]
     #    elif not keys:
@@ -255,10 +254,10 @@ def extract_tarball(spec, filename):
     with closing(tarfile.open(tarfile_path, 'r')) as tar:
         tar.extractall(path=join_path(installpath, '..'))
 
-    # os.remove(tarfile_path)
-    #os.remove(tarfile_path + '.asc')
-    # os.remove(specfile_path)
-    #os.remove(specfile_path + '.asc')
+    #os.remove(tarfile_path)
+    os.remove(tarfile_path + '.asc')
+    #os.remove(specfile_path)
+    os.remove(specfile_path + '.asc')
 
 
 def prelocate_package(spec):

lib/spack/spack/cmd/buildcache.py

@@ -44,7 +44,8 @@ def setup_parser(subparser):
 
     create = subparsers.add_parser('create')
     create.add_argument('-r', '--rel', action='store_true',
-                        help="make all rpaths relative before creating tarballs.")
+                        help="make all rpaths relative" +
+                             " before creating tarballs.")
     create.add_argument('-f', '--force', action='store_true',
                         help="overwrite tarball if it exists.")
     create.add_argument('-d', '--directory', metavar='directory',
@@ -143,8 +144,9 @@ def listspecs(args):
             tty.msg("buildcache spec(s) matching %s \n" % pkg)
             for spec in sorted(specs):
                 if re.search("^" + re.escape(pkg), str(spec)):
-                    tty.msg('run "spack buildcache install /%s" to install  %s\n' %
-                            (spec.dag_hash(7), spec.format()))
+                    tty.msg('run "spack buildcache install /%s"' %
+                            spec.dag_hash(7) + ' to install  %s\n' %
+                            spec.format())
     else:
         tty.msg("buildcache specs ")
         for spec in sorted(specs):

lib/spack/spack/relocate.py

@@ -37,6 +37,7 @@ def get_relative_rpaths(path_name, orig_dir, orig_rpaths):
             rel_rpaths.add(rpath)
     return rel_rpaths
 
+
 def modify_macho_object(path_name, old_dir, new_dir, relative):
     """
     Modify MachO binaries by changing rpaths,and id and dependency lib paths.
@@ -96,8 +97,8 @@ def modify_macho_object(path_name, old_dir, new_dir, relative):
     if relative:
         id = '@rpath/%s' % os.path.basename(idpath)
         for rpath in rpaths:
-            if re.match(old_dir,rpath):
-                rel=os.path.relpath(rpath,start=os.path.dirname(path_name))
+            if re.match(old_dir, rpath):
+                rel = os.path.relpath(rpath, start=os.path.dirname(path_name))
                 nrpaths.append('@loader_path/%s' % rel)
             else:
                 nrpaths.append(rpath)
@@ -214,6 +215,7 @@ def relocate_binary(path_name, old_dir, new_dir, patchelf_executable):
     else:
         tty.die("Relocation not implemented for %s" % platform.system())
 
+
 def prelocate_binary(path_name, old_dir, patchelf_executable):
     """
     Change RPATHs in given elf or mach-o file to relative