Merge pull request #644 from stepshal/spacing-comment-hash

Fix spacing after comment hash.

setuptools/package_index.py

@@ -325,7 +325,7 @@ class PackageIndex(Environment):
 
         base = f.url     # handle redirects
         page = f.read()
-        if not isinstance(page, str): # We are in Python 3 and got bytes. We want str.
+        if not isinstance(page, str):  # We are in Python 3 and got bytes. We want str.
             if isinstance(f, urllib.error.HTTPError):
                 # Errors have no charset, assume latin1:
                 charset = 'latin-1'

setuptools/py31compat.py

@@ -29,7 +29,7 @@ except ImportError:
         """
 
         def __init__(self):
-            self.name = None # Handle mkdtemp raising an exception
+            self.name = None  # Handle mkdtemp raising an exception
             self.name = tempfile.mkdtemp()
 
         def __enter__(self):
@@ -38,7 +38,7 @@ except ImportError:
         def __exit__(self, exctype, excvalue, exctrace):
             try:
                 shutil.rmtree(self.name, True)
-            except OSError: #removal errors are not the only possible
+            except OSError:  # removal errors are not the only possible
                 pass
             self.name = None
 

setuptools/site-patch.py

@@ -23,7 +23,7 @@ def __boot():
                 break
         else:
             try:
-                import imp # Avoid import loop in Python >= 3.3
+                import imp  # Avoid import loop in Python >= 3.3
                 stream, path, descr = imp.find_module('site', [item])
             except ImportError:
                 continue
@@ -38,7 +38,7 @@ def __boot():
     else:
         raise ImportError("Couldn't find the real 'site' module")
 
-    known_paths = dict([(makepath(item)[1], 1) for item in sys.path]) # 2.2 comp
+    known_paths = dict([(makepath(item)[1], 1) for item in sys.path])  # 2.2 comp
 
     oldpos = getattr(sys, '__egginsert', 0)   # save old insertion position
     sys.__egginsert = 0                     # and reset the current one

setuptools/tests/test_dist_info.py

@@ -25,8 +25,8 @@ class TestDistInfo:
         unversioned = dists['UnversionedDistribution']
         versioned = dists['VersionedDistribution']
 
-        assert versioned.version == '2.718' # from filename
-        assert unversioned.version == '0.3' # from METADATA
+        assert versioned.version == '2.718'  # from filename
+        assert unversioned.version == '0.3'  # from METADATA
 
     def test_conditional_dependencies(self):
         specs = 'splort==4', 'quux>=1.1'