- redirects should include comments

- testserver was importing wrong modules

2 files changed, 3 insertions, 7 deletions

diff --git a/paste/debug/testserver.py b/paste/debug/testserver.py
index 832142c..8e0dd98 100755
--- a/paste/debug/testserver.py
+++ b/paste/debug/testserver.py
@@ -11,7 +11,7 @@ where using raw_interactive won't do.
 
 """
 import time
-from paste.util.testserver import *
+from paste.util.baseserver import *
 
 class WSGIRegressionServer(WSGIServer):
     """
@@ -63,11 +63,7 @@ class WSGIRegressionServer(WSGIServer):
 def serve(application, host=None, port=None, handler=None):
     server = WSGIRegressionServer(application,host,port,handler)
     print "serving on %s:%s" % server.server_address
-    try:
-        server.serve_forever()
-    except KeyboardInterrupt:
-        # allow CTRL+C to shutdown
-        pass
+    server.serve_forever()
     return server
 
 if __name__ == '__main__':
diff --git a/paste/httpexceptions.py b/paste/httpexceptions.py
index af0b7ea..ebb67fe 100644
--- a/paste/httpexceptions.py
+++ b/paste/httpexceptions.py
@@ -267,7 +267,7 @@ class _HTTPMove(HTTPRedirection):
     template = (
         '%(explanation)s <a href="%(location)s">%(location)s</a>;\n'
         'you should be redirected automatically.\n'
-        '%(detail)s\n')
+        '%(detail)s\n<!-- %(comment)s -->')
 
     def __init__(self, detail=None, headers=None, comment=None):
         assert isinstance(headers, (type(None), list))