remove excess blank lines, and apply whitespace more in line with the Python

style guidelines in PEP 8

--HG--
branch : setuptools
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/trunk/setuptools%4040896

1 files changed, 16 insertions, 49 deletions

diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index 7d5b6ffd..95e83c30 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -1,10 +1,11 @@
+import os.path
+
 from distutils.command.build_py import build_py as _build_py
 from distutils.util import convert_path
 from glob import glob
-import os.path
 
-class build_py(_build_py):
 
+class build_py(_build_py):
     """Enhanced 'build_py' command that includes data files with packages
 
     The data files are specified via a 'package_data' argument to 'setup()'.
@@ -17,13 +18,10 @@ class build_py(_build_py):
     def finalize_options(self):
         _build_py.finalize_options(self)
         self.package_data = self.distribution.package_data
-        self.data_files   = self.get_data_files()
-
+        self.data_files = self.get_data_files()
 
     def run(self):
-
         """Build modules, packages, and copy data files to build directory"""
-
         if not self.py_modules and not self.packages:
             return
 
@@ -36,21 +34,17 @@ class build_py(_build_py):
 
         # Only compile actual .py files, using our base class' idea of what our
         # output files are.
-        self.byte_compile(_build_py.get_outputs(self,include_bytecode=0))
-
+        self.byte_compile(_build_py.get_outputs(self, include_bytecode=0))
 
     def get_data_files(self):
-
         """Generate list of '(package,src_dir,build_dir,filenames)' tuples"""
-
         data = []
-
         for package in self.packages:
             # Locate package source directory
             src_dir = self.get_package_dir(package)
 
             # Compute package build directory
-            build_dir = os.path.join(*([self.build_lib]+package.split('.')))
+            build_dir = os.path.join(*([self.build_lib] + package.split('.')))
 
             # Length of path to strip from found files
             plen = len(src_dir)+1
@@ -58,44 +52,30 @@ class build_py(_build_py):
             # Strip directory from globbed filenames
             filenames = [
                 file[plen:] for file in self.find_data_files(package, src_dir)
-            ]
-
+                ]
             data.append( (package, src_dir, build_dir, filenames) )
-
         return data
 
-
     def find_data_files(self, package, src_dir):
-
         """Return filenames for package's data files in 'src_dir'"""
-
-        globs = self.package_data.get('',[])+self.package_data.get(package,[])
+        globs = (self.package_data.get('', [])
+                 + self.package_data.get(package, []))
         files = []
-
         for pattern in globs:
             # Each pattern has to be converted to a platform-specific path
             files.extend(glob(os.path.join(src_dir, convert_path(pattern))))
-
         return files
 
-
-
     def build_package_data(self):
-
         """Copy data files into build directory"""
-
         lastdir = None
-
         for package, src_dir, build_dir, filenames in self.data_files:
-
             for filename in filenames:
-                target = os.path.join(build_dir,filename)
+                target = os.path.join(build_dir, filename)
                 self.mkpath(os.path.dirname(target))
-                self.copy_file(os.path.join(src_dir,filename), target)
-
+                self.copy_file(os.path.join(src_dir, filename), target)
 
     def get_outputs(self, include_bytecode=1):
-
         """Return complete list of files copied to the build directory
 
         This includes both '.py' files and data files, as well as '.pyc' and
@@ -103,21 +83,8 @@ class build_py(_build_py):
         the 'install_lib' command to do its job properly, and to generate a
         correct installation manifest.)
         """
-
-        return _build_py.get_outputs(self,include_bytecode) + [
-            os.path.join(build_dir,filename)
-                for package,src_dir,build_dir,filenames in self.data_files
-                    for filename in filenames
-        ]
-
-
-
-
-
-
-
-
-
-
-
-
+        return _build_py.get_outputs(self, include_bytecode) + [
+            os.path.join(build_dir, filename)
+            for package, src_dir, build_dir,filenames in self.data_files
+            for filename in filenames
+            ]