Split out the bit that checks recursively.

1 files changed, 19 insertions, 4 deletions

diff --git a/pyflakes/scripts/pyflakes.py b/pyflakes/scripts/pyflakes.py
index ad9124c..3d74052 100644
--- a/pyflakes/scripts/pyflakes.py
+++ b/pyflakes/scripts/pyflakes.py
@@ -156,14 +156,29 @@ def iterSourceCode(paths):
 
 
 
-def main():
+def checkRecursive(paths, reporter):
+    """
+    Recursively check all source files in C{paths}.
+
+    @param paths: A list of paths to Python source files and directories
+        containing Python source files.
+    @param reporter: A L{Reporter} where all of the warnings and errors
+        will be reported to.
+    @return: The number of warnings found.
+    """
     warnings = 0
+    for sourcePath in iterSourceCode(paths):
+        warnings += checkPath(sourcePath, reporter)
+    return warnings
+
+
+
+def main():
     args = sys.argv[1:]
     reporter = Reporter(None, sys.stderr)
     if args:
-        for sourcePath in iterSourceCode(args):
-            warnings += checkPath(sourcePath, reporter)
+        warnings = checkRecursive(args, reporter)
     else:
-        warnings += check(sys.stdin.read(), '<stdin>')
+        warnings = check(sys.stdin.read(), '<stdin>')
 
     raise SystemExit(warnings > 0)