From: R. David Murray <rdmurray@bitdance.com>
Date: Mon, 31 May 2010 23:23:50 +0000 (+0000)
Subject: Merged revisions 81587 via svnmerge from
X-Git-Tag: v3.2a1~662
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5ab2e7403638ef0d67de6c8464bded2daa9820d6;p=python

Merged revisions 81587 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81587 | r.david.murray | 2010-05-28 14:17:20 -0400 (Fri, 28 May 2010) | 2 lines

  Make the ctl-C shutdown of serve.py prettier.
........
---

diff --git a/Tools/scripts/serve.py b/Tools/scripts/serve.py
index 6b1321a067..c3b7bdbaaf 100755
--- a/Tools/scripts/serve.py
+++ b/Tools/scripts/serve.py
@@ -28,5 +28,8 @@ if __name__ == '__main__':
     path = sys.argv[1]
     port = int(sys.argv[2]) if len(sys.argv) > 2 else 8000
     httpd = simple_server.make_server('', port, app)
-    print("Serving {} on port {}".format(path, port))
-    httpd.serve_forever()
+    print("Serving {} on port {}, control-C to stop".format(path, port))
+    try:
+        httpd.serve_forever()
+    except KeyboardInterrupt:
+        print("\b\bShutting down.")