Normalize whitespace, removing pyflakes warnings.

1 files changed, 21 insertions, 86 deletions

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index a0ba5305..a1ce862c 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -3,7 +3,10 @@
 Create a distribution's .egg-info directory and contents"""
 
 # This module should be kept compatible with Python 2.3
-import os, re, sys
+import os
+import re
+import sys
+
 from setuptools import Command
 from distutils.errors import *
 from distutils import log
@@ -36,12 +39,6 @@ class egg_info(Command):
     negative_opt = {'no-svn-revision': 'tag-svn-revision',
                     'no-date': 'tag-date'}
 
-
-
-
-
-
-
     def initialize_options(self):
         self.egg_name = None
         self.egg_version = None
@@ -55,35 +52,16 @@ class egg_info(Command):
 
     def save_version_info(self, filename):
         from setuptools.command.setopt import edit_config
-        edit_config(
-            filename,
-            {'egg_info':
-                {'tag_svn_revision':0, 'tag_date': 0, 'tag_build': self.tags()}
-            }
+        values = dict(
+            egg_info=dict(
+                tag_svn_revision=0,
+                tag_date=0,
+                tag_build=self.tags(),
+            )
         )
+        edit_config(filename, values)
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    def finalize_options (self):
+    def finalize_options(self):
         self.egg_name = safe_name(self.distribution.get_name())
         self.vtags = self.tags()
         self.egg_version = self.tagged_version()
@@ -123,7 +101,6 @@ class egg_info(Command):
             pd._parsed_version = parse_version(self.egg_version)
             self.distribution._patched_dist = None
 
-
     def write_or_delete_file(self, what, filename, data, force=False):
         """Write `data` to `filename` or delete if empty
 
@@ -194,34 +171,14 @@ class egg_info(Command):
             os.path.exists('.svn') or os.path.exists('PKG-INFO')
         ):  version += '-r%s' % self.get_svn_revision()
         if self.tag_date:
-            import time; version += time.strftime("-%Y%m%d")
+            import time
+            version += time.strftime("-%Y%m%d")
         return version
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
     @staticmethod
     def get_svn_revision():
         return str(svn_utils.SvnInfo.load(os.curdir).get_revision())
 
-
-
-
-
-
     def find_sources(self):
         """Generate SOURCES.txt manifest file"""
         manifest_filename = os.path.join(self.egg_info,"SOURCES.txt")
@@ -269,17 +226,11 @@ class FileList(_FileList):
                 self.files.append(path)
 
 
-
-
-
-
-
-
 class manifest_maker(sdist):
 
     template = "MANIFEST.in"
 
-    def initialize_options (self):
+    def initialize_options(self):
         self.use_defaults = 1
         self.prune = 1
         self.manifest_only = 1
@@ -301,7 +252,7 @@ class manifest_maker(sdist):
         self.filelist.remove_duplicates()
         self.write_manifest()
 
-    def write_manifest (self):
+    def write_manifest(self):
         """Write the file list in 'self.filelist' (presumably as filled in
         by 'add_defaults()' and 'read_template()') to the manifest file
         named by 'self.manifest'.
@@ -340,7 +291,7 @@ class manifest_maker(sdist):
         ei_cmd = self.get_finalized_command('egg_info')
         self.filelist.include_pattern("*", prefix=ei_cmd.egg_info)
 
-    def prune_file_list (self):
+    def prune_file_list(self):
         build = self.get_finalized_command('build')
         base_dir = self.distribution.get_fullname()
         self.filelist.exclude_pattern(None, prefix=build.build_base)
@@ -349,7 +300,7 @@ class manifest_maker(sdist):
         self.filelist.exclude_pattern(sep+r'(RCS|CVS|\.svn)'+sep, is_regex=1)
 
 
-def write_file (filename, contents):
+def write_file(filename, contents):
     """Create a file with the specified name and write 'contents' (a
     sequence of strings without line terminators) to it.
     """
@@ -360,24 +311,12 @@ def write_file (filename, contents):
     f.write(contents)
     f.close()
 
-
-
-
-
-
-
-
-
-
-
-
-
 def write_pkg_info(cmd, basename, filename):
     log.info("writing %s", filename)
     if not cmd.dry_run:
         metadata = cmd.distribution.metadata
         metadata.version, oldver = cmd.egg_version, metadata.version
-        metadata.name, oldname   = cmd.egg_name, metadata.name
+        metadata.name, oldname = cmd.egg_name, metadata.name
         try:
             # write unescaped data to PKG-INFO, so older pkg_resources
             # can still parse it
@@ -406,14 +345,14 @@ def write_requirements(cmd, basename, filename):
 
 def write_toplevel_names(cmd, basename, filename):
     pkgs = dict.fromkeys(
-        [k.split('.',1)[0]
+        [
+            k.split('.',1)[0]
             for k in cmd.distribution.iter_distribution_names()
         ]
     )
     cmd.write_file("top-level names", filename, '\n'.join(pkgs)+'\n')
 
 
-
 def overwrite_arg(cmd, basename, filename):
     write_arg(cmd, basename, filename, True)
 
@@ -452,7 +391,3 @@ def get_pkg_info_revision():
                 return int(match.group(1))
         f.close()
     return 0
-
-
-
-#