launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:remove-zope.app.appsetup into launchpad:master.

Commit message:
Remove direct use of zope.app.appsetup

The database events we use from it have just been compatibility imports
from zope.processlifetime for some time.

(Some indirect uses of zope.app.appsetup still remain.)

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/374467
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:remove-zope.app.appsetup into launchpad:master.

diff --git a/lib/lp/services/webapp/configure.zcml b/lib/lp/services/webapp/configure.zcml
index 84cacdb..633210a 100644
--- a/lib/lp/services/webapp/configure.zcml
+++ b/lib/lp/services/webapp/configure.zcml
@@ -339,31 +339,31 @@
 
     <!-- Signal handlers -->
     <subscriber
-        for="zope.app.appsetup.IProcessStartingEvent"
+        for="zope.processlifetime.IProcessStarting"
         handler="lp.services.webapp.sighup.setup_sighup"
         />
     <subscriber
-        for="zope.app.appsetup.IProcessStartingEvent"
+        for="zope.processlifetime.IProcessStarting"
         handler="lp.services.webapp.sigusr1.setup_sigusr1"
         />
     <subscriber
-        for="zope.app.appsetup.IProcessStartingEvent"
+        for="zope.processlifetime.IProcessStarting"
         handler="lp.services.webapp.sigusr2.setup_sigusr2"
         />
     <subscriber
-        for="zope.app.appsetup.IProcessStartingEvent"
+        for="zope.processlifetime.IProcessStarting"
         handler="lp.services.webapp.sigdumpmem.setup_sigdumpmem"
         />
 
     <!-- Confirm that no main thread event handlers use the connection cache -->
     <subscriber
-        for="zope.app.appsetup.IProcessStartingEvent"
+        for="zope.processlifetime.IProcessStarting"
         handler="lp.services.webapp.adapter.break_main_thread_db_access"
         />
 
     <!-- Set the default timeout function. -->
     <subscriber
-        for="zope.app.appsetup.IProcessStartingEvent"
+        for="zope.processlifetime.IProcessStarting"
         handler="lp.services.webapp.adapter.set_launchpad_default_timeout"
         />
 
diff --git a/lib/lp/services/webapp/doc/timeout.txt b/lib/lp/services/webapp/doc/timeout.txt
index 0458a65..3387d72 100644
--- a/lib/lp/services/webapp/doc/timeout.txt
+++ b/lib/lp/services/webapp/doc/timeout.txt
@@ -13,7 +13,7 @@ time remaining before the request should time out.
     ...     set_launchpad_default_timeout)
     >>> old_func = get_default_timeout_function()
 
-    >>> from zope.app.appsetup import ProcessStarting
+    >>> from zope.processlifetime import ProcessStarting
 
     # We don't use notify here, because we don't want to invoke the
     # other subscribers.
diff --git a/setup.py b/setup.py
index a2141cf..e1b28e3 100644
--- a/setup.py
+++ b/setup.py
@@ -237,7 +237,6 @@ setup(
         'z3c.pt',
         'z3c.ptcompat',
         'zc.zservertracelog',
-        'zope.app.appsetup',
         'zope.app.http',
         'zope.app.publication',
         'zope.app.publisher',
@@ -260,6 +259,7 @@ setup(
         'zope.login',
         'zope.pagetemplate',
         'zope.principalregistry',
+        'zope.processlifetime',
         'zope.proxy',
         'zope.publisher',
         'zope.schema',