Skip the traceback on Control+C and Broken pipe signals; fixes lp:1285290

2 files changed, 15 insertions, 2 deletions

diff --git a/NEWS.txt b/NEWS.txt
index f2cb215..7e81cf7 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -1,3 +1,6 @@
+UNRELEASED:
+  - Skip the traceback on Control+C and "Broken pipe" signals.
+
 0.8.1 (2014-03-30):
   - Detect the declared encoding in Python 3.
   - Do not report redefinition of import in a local scope, if the
diff --git a/pyflakes/api.py b/pyflakes/api.py
index f32881e..e8647f9 100644
--- a/pyflakes/api.py
+++ b/pyflakes/api.py
@@ -6,7 +6,6 @@ from __future__ import with_statement
 import sys
 import os
 import _ast
-from optparse import OptionParser
 
 from pyflakes import checker, __version__
 from pyflakes import reporter as modReporter
@@ -123,7 +122,18 @@ def checkRecursive(paths, reporter):
 
 
 def main(prog=None):
-    parser = OptionParser(prog=prog, version=__version__)
+    """Entry point for the script "pyflakes"."""
+    import optparse
+    import signal
+
+    # Handle "Keyboard Interrupt" and "Broken pipe" gracefully
+    try:
+        signal.signal(signal.SIGINT, lambda sig, f: sys.exit('... stopped'))
+        signal.signal(signal.SIGPIPE, lambda sig, f: sys.exit(1))
+    except ValueError:
+        pass    # SIGPIPE is not supported on Windows
+
+    parser = optparse.OptionParser(prog=prog, version=__version__)
     (__, args) = parser.parse_args()
     reporter = modReporter._makeDefaultReporter()
     if args: