[Checkins] SVN: gocept.selenium/branches/janjaapdriessen-wsgi/src/gocept/selenium/ztk/__init__.py Remove the custom SwitchableDBApplication

[Wolfgang Schnerring]

Log message for revision 118695:
  Remove the custom SwitchableDBApplication
  
  It does not actually provide any encapsulation against zope.app.wsgi since we inherit from it, so we might as well do the DB switching from the outside and save the hassle.
  

Changed:
  U   gocept.selenium/branches/janjaapdriessen-wsgi/src/gocept/selenium/ztk/__init__.py

-=-
Modified: gocept.selenium/branches/janjaapdriessen-wsgi/src/gocept/selenium/ztk/__init__.py
===================================================================
--- gocept.selenium/branches/janjaapdriessen-wsgi/src/gocept/selenium/ztk/__init__.py	2010-12-04 08:56:47 UTC (rev 118694)
+++ gocept.selenium/branches/janjaapdriessen-wsgi/src/gocept/selenium/ztk/__init__.py	2010-12-04 08:57:59 UTC (rev 118695)
@@ -28,7 +28,7 @@
         task_dispatcher = ThreadedTaskDispatcher()
         task_dispatcher.setThreadCount(1)
         db = zope.app.testing.functional.FunctionalTestSetup().db
-        self.http = SwitchableDBServerType.create(
+        self.http = zope.app.server.wsgi.http.create(
             'WSGI-HTTP', task_dispatcher, db, port=self.port)
         self.thread = threading.Thread(target=self.run_server)
         self.thread.setDaemon(True)
@@ -57,28 +57,7 @@
         # DemoStorage (which is set by FunctionalTestCase)
         super(TestCase, self).setUp()
         db = zope.app.testing.functional.FunctionalTestSetup().db
-        self.layer.http.application.set_db(db)
-
-
-class SwitchableDBApplication(zope.app.wsgi.WSGIPublisherApplication):
-
-    def __init__(self, *args, **kw):
-        self.db = kw.get('db', None)
-        super(SwitchableDBApplication, self).__init__(*args, **kw)
-
-    def __call__(self, environ, start_response):
-        if self.db is not None:
-            factory = type(self.requestFactory)
-            self.requestFactory = factory(self.db)
-        return super(SwitchableDBApplication, self).__call__(
-            environ, start_response)
-
-    def set_db(self, db):
-        self.db = db
-
-
-SwitchableDBServerType = zope.app.server.wsgi.ServerType(
-    zope.server.http.wsgihttpserver.WSGIHTTPServer,
-    SwitchableDBApplication,
-    zope.server.http.commonaccesslogger.CommonAccessLogger,
-    8087, True)  # The port number here is just the default value
+        application = self.layer.http.application
+        assert isinstance(application, zope.app.wsgi.WSGIPublisherApplication)
+        factory = type(application.requestFactory)
+        application.requestFactory = factory(db)