From 09e310277d66e46dc61b1a921fde293c33887edd Mon Sep 17 00:00:00 2001 From: Daniel Schadt Date: Fri, 20 Nov 2015 16:13:30 +0100 Subject: [PATCH] Remove server global, use lambda instead --- tests/integration/webserver_sub.py | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/tests/integration/webserver_sub.py b/tests/integration/webserver_sub.py index 81efa9c6e..a15ac4df5 100644 --- a/tests/integration/webserver_sub.py +++ b/tests/integration/webserver_sub.py @@ -33,7 +33,6 @@ from httpbin.structures import CaseInsensitiveDict import cherrypy.wsgiserver import flask -server = None @app.route('/data/') def send_data(path): @@ -91,27 +90,19 @@ class WSGIServer(cherrypy.wsgiserver.CherryPyWSGIServer): self._ready = value -def shutdown(*args): - """Stop the server.""" - if server is None: - return - server.stop() - - def main(): - global server if hasattr(sys, 'frozen'): basedir = os.path.realpath(os.path.dirname(sys.executable)) app.template_folder = os.path.join(basedir, 'integration', 'templates') port = int(sys.argv[1]) server = WSGIServer(('0.0.0.0', port), app) - signal.signal(signal.SIGTERM, shutdown) + signal.signal(signal.SIGTERM, lambda *args: server.stop()) try: server.start() except KeyboardInterrupt: - shutdown() + server.stop() if __name__ == '__main__':