Normalize whitespace in package_index.py

1 files changed, 2 insertions, 77 deletions

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 4c2e10f9..9abd9679 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -403,8 +403,6 @@ class PackageIndex(Environment):
         else:
             return ""   # no sense double-scanning non-package pages
 
-
-
     def need_version_info(self, url):
         self.scan_all(
             "Page at %s links to .py file(s) without version info; an index "
@@ -435,17 +433,14 @@ class PackageIndex(Environment):
             self.scan_url(url)
 
     def obtain(self, requirement, installer=None):
-        self.prescan(); self.find_packages(requirement)
+        self.prescan()
+        self.find_packages(requirement)
         for dist in self[requirement.key]:
             if dist in requirement:
                 return dist
             self.debug("%s does not match %s", requirement, dist)
         return super(PackageIndex, self).obtain(requirement,installer)
 
-
-
-
-
     def check_hash(self, checker, filename, tfp):
         """
         checker is a ContentChecker
@@ -531,7 +526,6 @@ class PackageIndex(Environment):
                     )
         return getattr(self.fetch_distribution(spec, tmpdir),'location',None)
 
-
     def fetch_distribution(
             self, requirement, tmpdir, force_scan=False, source=False,
             develop_ok=False, local_index=None
@@ -573,8 +567,6 @@ class PackageIndex(Environment):
                 if dist in req and (dist.precedence<=SOURCE_DIST or not source):
                     return dist
 
-
-
         if force_scan:
             self.prescan()
             self.find_packages(requirement)
@@ -601,7 +593,6 @@ class PackageIndex(Environment):
             self.info("Best match: %s", dist)
             return dist.clone(location=self.download(dist.location, tmpdir))
 
-
     def fetch(self, requirement, tmpdir, force_scan=False, source=False):
         """Obtain a file suitable for fulfilling `requirement`
 
@@ -615,7 +606,6 @@ class PackageIndex(Environment):
             return dist.location
         return None
 
-
     def gen_setup(self, filename, fragment, tmpdir):
         match = EGG_FRAGMENT.match(fragment)
         dists = match and [
@@ -770,7 +760,6 @@ class PackageIndex(Environment):
     def scan_url(self, url):
         self.process_url(url, True)
 
-
     def _attempt_download(self, url, filename):
         headers = self._download_to(url, filename)
         if 'html' in headers.get('content-type','').lower():
@@ -793,21 +782,6 @@ class PackageIndex(Environment):
         os.unlink(filename)
         raise DistutilsError("Unexpected HTML page found at "+url)
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
     def _download_svn(self, url, filename):
         url = url.split('#',1)[0]   # remove any fragment for svn's sake
         creds = ''
@@ -886,18 +860,6 @@ class PackageIndex(Environment):
     def warn(self, msg, *args):
         log.warn(msg, *args)
 
-
-
-
-
-
-
-
-
-
-
-
-
 # This pattern matches a character entity reference (a decimal numeric
 # references, a hexadecimal numeric reference, or a named reference).
 entity_sub = re.compile(r'&(#(\d+|x[\da-fA-F]+)|[\w.:-]+);?').sub
@@ -922,20 +884,6 @@ def htmldecode(text):
     """Decode HTML entities in the given text."""
     return entity_sub(decode_entity, text)
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 def socket_timeout(timeout=15):
     def _socket_timeout(func):
         def _socket_timeout(*args, **kwargs):
@@ -1004,15 +952,6 @@ def open_with_auth(url, opener=urllib2.urlopen):
 open_with_auth = socket_timeout(_SOCKET_TIMEOUT)(open_with_auth)
 
 
-
-
-
-
-
-
-
-
-
 def fix_sf_url(url):
     return url      # backward compatibility
 
@@ -1042,17 +981,3 @@ def local_open(url):
 
     return HTTPError(url, status, message,
             {'content-type':'text/html'}, StringIO(body))
-
-
-
-
-
-
-
-
-
-
-
-
-
-# this line is a kludge to keep the trailing blank lines for pje's editor