Merge branch 'issue/31' into 'master'

Add FileQReport to replace pep8's FileReport when using multiprocessing

See merge request !21

2 files changed, 12 insertions, 2 deletions

diff --git a/flake8/engine.py b/flake8/engine.py
index 7886b48..1ed06f2 100644
--- a/flake8/engine.py
+++ b/flake8/engine.py
@@ -6,7 +6,8 @@ import pep8
 
 from flake8 import __version__
 from flake8 import callbacks
-from flake8.reporter import multiprocessing, BaseQReport, QueueReport
+from flake8.reporter import (multiprocessing, BaseQReport, FileQReport,
+                             QueueReport)
 from flake8.util import OrderedSet, is_windows, is_using_stdin
 
 _flake8_noqa = re.compile(r'\s*# flake8[:=]\s*noqa', re.I).search
@@ -137,7 +138,11 @@ def get_style_guide(**kwargs):
                 n_jobs = 1
         if n_jobs > 1:
             options.jobs = n_jobs
-            reporter = BaseQReport if options.quiet else QueueReport
+            reporter = QueueReport
+            if options.quiet:
+                reporter = BaseQReport
+                if options.quiet == 1:
+                    reporter = FileQReport
             report = styleguide.init_report(reporter)
             report.input_file = styleguide.input_file
             styleguide.runner = report.task_queue.put
diff --git a/flake8/reporter.py b/flake8/reporter.py
index 5cf17e4..5fc2743 100644
--- a/flake8/reporter.py
+++ b/flake8/reporter.py
@@ -92,6 +92,11 @@ class BaseQReport(pep8.BaseReport):
         self.messages.update(state['messages'])
 
 
+class FileQReport(BaseQReport):
+    """File Queue Report."""
+    print_filename = True
+
+
 class QueueReport(pep8.StandardReport, BaseQReport):
     """Standard Queue Report."""