From 5ab2e7403638ef0d67de6c8464bded2daa9820d6 Mon Sep 17 00:00:00 2001 From: "R. David Murray" Date: Mon, 31 May 2010 23:23:50 +0000 Subject: [PATCH] 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. ........ --- Tools/scripts/serve.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Tools/scripts/serve.py b/Tools/scripts/serve.py index 6b1321a0671..c3b7bdbaaf7 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.")