Merge branch 'graceful-stop'

2 files changed, 10 insertions, 5 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 4dc5631..ef70009 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -11,6 +11,8 @@ Changelog
 
 * Read from standard input if no path is specified.
 
+* Initiate a graceful shutdown on ``Control+C``.
+
 
 1.4.2 (2013-02-10)
 ------------------
diff --git a/pep8.py b/pep8.py
index e571751..039c714 100755
--- a/pep8.py
+++ b/pep8.py
@@ -1603,11 +1603,14 @@ class StyleGuide(object):
         report = self.options.report
         runner = self.runner
         report.start()
-        for path in paths:
-            if os.path.isdir(path):
-                self.input_dir(path)
-            elif not self.excluded(path):
-                runner(path)
+        try:
+            for path in paths:
+                if os.path.isdir(path):
+                    self.input_dir(path)
+                elif not self.excluded(path):
+                    runner(path)
+        except KeyboardInterrupt:
+            print('... stopped')
         report.stop()
         return report