Merged (bitbucket) pull request #32

From diogobaeder/flake8/default

flake8/hooks.py

@@ -14,7 +14,7 @@ from flake8.main import DEFAULT_CONFIG
 
 def git_hook(complexity=-1, strict=False, ignore=None, lazy=False):
     """This is the function used by the git hook.
-    
+
     :param int complexity: (optional), any value > 0 enables complexity
         checking with mccabe
     :param bool strict: (optional), if True, this returns the total number of

flake8/main.py

@@ -42,7 +42,7 @@ def main():
 
 
 def check_file(path, ignore=(), complexity=-1):
-    """Checks a file using pep8 and pyflakes by default and mccabe 
+    """Checks a file using pep8 and pyflakes by default and mccabe
     optionally.
 
     :param str path: path to the file to be checked

setup.py

@@ -31,7 +31,6 @@ setup(
     url="http://bitbucket.org/tarek/flake8",
     packages=["flake8", "flake8.tests"],
     install_requires=[
-        "setuptools",
         "pyflakes >= 0.6.1",
         "pep8 >= 1.4.3",
         "mccabe >= 0.2",