Fix pep8.py and its invocation.

pep8.py:input_file() normally returns the number of errors found in a given file, but it returns an empty dict if the file is excluded. Change it to return 0 instead. config.py is auto-generated with a prefix that may be longer than 80 characters. Exclude config.py in the pep8.py check. This fixes 4042.
dieterv · May 28, 2009 · f941537 · f941537
1 parent aa94335
commit f941537
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -53,6 +53,6 @@ upload-release: $(distdir).tar.gz
 
 check-local:
 	@echo "  PEP-8 INQUISITION"
-	@find $(top_srcdir)/giscanner -name \*.py | sort | uniq | xargs $(PYTHON) $(top_srcdir)/misc/pep8.py --repeat
+	@find $(top_srcdir)/giscanner -name \*.py | sort | uniq | xargs $(PYTHON) $(top_srcdir)/misc/pep8.py --repeat --exclude=config.py
 	@echo "  CHECK Pyflakes"
 	@find $(top_srcdir)/giscanner -name \*.py | sort | uniq | xargs $(PYTHON) $(top_srcdir)/misc/pyflakes.py
diff --git a/misc/pep8.py b/misc/pep8.py
@@ -647,7 +647,7 @@ def input_file(filename):
     Run all checks on a Python source file.
     """
     if excluded(filename) or not filename_match(filename):
-        return {}
+        return 0
     if options.verbose:
         message('checking ' + filename)
     options.counters['files'] = options.counters.get('files', 0) + 1