Just do the construction once

1 files changed, 4 insertions, 6 deletions

diff --git a/cherrypy/daemon.py b/cherrypy/daemon.py
index d71e6329..c3720b49 100755
--- a/cherrypy/daemon.py
+++ b/cherrypy/daemon.py
@@ -54,14 +54,12 @@ def start(configfiles=None, daemonize=False, environment=None,
 
         addr = cherrypy.server.bind_addr
         if fastcgi:
-            f = servers.FlupFCGIServer(application=cherrypy.tree,
-                                       bindAddress=addr)
+            cls = servers.FlupFCGIServer
         elif scgi:
-            f = servers.FlupSCGIServer(application=cherrypy.tree,
-                                       bindAddress=addr)
+            cls = servers.FlupSCGIServer
         else:
-            f = servers.FlupCGIServer(application=cherrypy.tree,
-                                      bindAddress=addr)
+            cls = servers.FlupCGIServer
+        f = cls(application=cherrypy.tree, bindAddress=addr)
         s = servers.ServerAdapter(engine, httpserver=f, bind_addr=addr)
         s.subscribe()