launchpad-reviewers team mailing list archive

[Colin Watson <mp+429129@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:ztk-upgrade into launchpad:master.

Commit message:
Upgrade to ZTK 8919f502ba (2021-04-15)

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/429129

Dependencies MP: https://code.launchpad.net/~cjwatson/lp-source-dependencies/+git/lp-source-dependencies/+merge/429128
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:ztk-upgrade into launchpad:master.

diff --git a/lib/lp/app/doc/menus.rst b/lib/lp/app/doc/menus.rst
index 001eac8..b6a8c9f 100644
--- a/lib/lp/app/doc/menus.rst
+++ b/lib/lp/app/doc/menus.rst
@@ -444,12 +444,12 @@ is defined in by the RecipeMenu class and the view of recipe.
     link summary
         url: http://launchpad.test/joy-of-cooking/fried-spam
         enabled: True
-        menu: <...IRecipeEditMenuMarker...>
+        menu: builtins.IRecipeEditMenuMarker
         linked: False
     link journal
         url: http://launchpad.test/joy-of-cooking/fried-spam/+journal
         enabled: True
-        menu: <...IRecipeJournalMenuMarker...>
+        menu: builtins.IRecipeJournalMenuMarker
         linked: True
 
 
@@ -642,12 +642,12 @@ seeing. The matched URI comes from the view's request...
     link summary
         url: http://launchpad.test/joy-of-cooking/fried-spam
         enabled: True
-        menu: <...IRecipeEditMenuMarker...>
+        menu: builtins.IRecipeEditMenuMarker
         linked: False
     link journal
         url: http://launchpad.test/joy-of-cooking/fried-spam/+journal
         enabled: True
-        menu: <...IRecipeJournalMenuMarker...>
+        menu: builtins.IRecipeJournalMenuMarker
         linked: True
 
 ...or from the request_url keyword argument for iterlinks() that is
@@ -659,12 +659,12 @@ passed by the helper function.
     link summary
         url: http://launchpad.test/joy-of-cooking/fried-spam
         enabled: True
-        menu: <...IRecipeEditMenuMarker...>
+        menu: builtins.IRecipeEditMenuMarker
         linked: True
     link journal
         url: http://launchpad.test/joy-of-cooking/fried-spam/+journal
         enabled: True
-        menu: <...IRecipeJournalMenuMarker...>
+        menu: builtins.IRecipeJournalMenuMarker
         linked: False
 
 Note that query parameters are ignored when matching the URL.
@@ -775,12 +775,12 @@ identical to the one in the parent's menu.)
     link summary
         url: http://launchpad.test/joy-of-cooking/fried-spam
         enabled: True
-        menu: <...IRecipeEditMenuMarker...>
+        menu: builtins.IRecipeEditMenuMarker
         linked: False
     link journal
         url: http://launchpad.test/joy-of-cooking/fried-spam/+journal
         enabled: True
-        menu: <...IRecipeJournalMenuMarker...>
+        menu: builtins.IRecipeJournalMenuMarker
         linked: True
 
     >>> recipe_overview_menu = queryAdapter(
@@ -813,12 +813,12 @@ menu of the RecipeMenu will change the state of both menus.
     link summary
         url: http://launchpad.test/joy-of-cooking/fried-spam
         enabled: True
-        menu: <...IRecipeEditMenuMarker...>
+        menu: builtins.IRecipeEditMenuMarker
         linked: True
     link journal
         url: http://launchpad.test/joy-of-cooking/fried-spam/+journal
         enabled: True
-        menu: <...IRecipeJournalMenuMarker...>
+        menu: builtins.IRecipeJournalMenuMarker
         linked: False
 
     >>> summarise_links(
@@ -910,12 +910,12 @@ instancemethods object.
     link summary
         url: http://launchpad.test/joy-of-cooking/fried-spam
         enabled: True
-        menu: <...IRecipeEditMenuMarker...>
+        menu: builtins.IRecipeEditMenuMarker
         linked: True
     link journal
         url: http://launchpad.test/joy-of-cooking/fried-spam/+journal
         enabled: True
-        menu: <...IRecipeJournalMenuMarker...>
+        menu: builtins.IRecipeJournalMenuMarker
         linked: False
 
     # Restore the _last_obj_traversed to the view that matches the
@@ -973,12 +973,12 @@ over the links. The TALES takes the form of 'view/menu:navigation'.
     link journal
         url: http://launchpad.test/joy-of-cooking/fried-spam/+journal
         enabled: True
-        menu: <...IRecipeJournalMenuMarker...>
+        menu: builtins.IRecipeJournalMenuMarker
         linked: False
     link summary
         url: http://launchpad.test/joy-of-cooking/fried-spam
         enabled: True
-        menu: <...IRecipeEditMenuMarker...>
+        menu: builtins.IRecipeEditMenuMarker
         linked: True
 
     >>> links_dict = test_tales(
@@ -1048,12 +1048,12 @@ returned.
     link journal
         url: http://launchpad.test/joy-of-cooking/fried-spam/+journal
         enabled: True
-        menu: <...IRecipeJournalMenuMarker...>
+        menu: builtins.IRecipeJournalMenuMarker
         linked: False
     link summary
         url: http://launchpad.test/joy-of-cooking/fried-spam
         enabled: True
-        menu: <...IRecipeEditMenuMarker...>
+        menu: builtins.IRecipeEditMenuMarker
         linked: True
 
 
diff --git a/lib/lp/services/authserver/testing.py b/lib/lp/services/authserver/testing.py
index 34f1cd5..bc6a172 100644
--- a/lib/lp/services/authserver/testing.py
+++ b/lib/lp/services/authserver/testing.py
@@ -32,7 +32,7 @@ class InProcessAuthServer(xmlrpc.XMLRPC):
         if name.startswith("xmlrpc_"):
             return getattr(self.authserver, name[len("xmlrpc_") :])
         else:
-            raise AttributeError("%r has no attribute '%s'" % name)
+            raise AttributeError("%r has no attribute '%s'" % (self, name))
 
 
 class InProcessAuthServerFixture(fixtures.Fixture, xmlrpc.XMLRPC):
diff --git a/requirements/ztk-versions.cfg b/requirements/ztk-versions.cfg
index f484e39..7d2a868 100644
--- a/requirements/ztk-versions.cfg
+++ b/requirements/ztk-versions.cfg
@@ -2,14 +2,14 @@
 # ZTK
 zope.annotation = 4.7.0
 zope.applicationcontrol = 4.2.0
-zope.authentication = 4.4.0
+zope.authentication = 4.5.0
 zope.browser = 2.3
 zope.browsermenu = 4.4
 zope.browserpage = 4.4.0
 zope.browserresource = 4.4
 zope.cachedescriptors = 4.3.1
-zope.catalog = 4.2.1
-zope.component = 4.6.2
+zope.catalog = 4.3.0
+zope.component = 5.0.0
 zope.componentvocabulary = 2.2.0
 zope.configuration = 4.4.0
 zope.container = 4.4.0
@@ -31,27 +31,27 @@ zope.hookable = 5.0.1
 zope.i18n = 4.7.0
 zope.i18nmessageid = 5.0.1
 zope.index = 5.0.0
-zope.interface = 5.1.0
-zope.intid = 4.3.0
+zope.interface = 5.4.0
+zope.intid = 4.4.0
 zope.keyreference = 4.2.0
 zope.lifecycleevent = 4.3
 zope.location = 4.2
 zope.login = 2.1.0
-zope.mimetype = 2.5.0
+zope.mimetype = 2.5.1
 zope.minmax = 2.2.0
 zope.pagetemplate = 4.5.0
 zope.password = 4.3.1
-zope.pluggableauth = 2.3.0
+zope.pluggableauth = 2.3.1
 zope.principalannotation = 4.3.0
 zope.principalregistry = 4.2.0
 zope.processlifetime = 2.3.0
 zope.proxy = 4.3.5
 zope.ptresource = 4.2.0
-zope.publisher = 6.0.0
+zope.publisher = 6.0.1
 zope.ramcache = 2.3
 zope.schema = 6.0.0
 zope.security = 5.1.1
-zope.securitypolicy = 4.3.1
+zope.securitypolicy = 4.3.2
 zope.sendmail = 5.1
 zope.session = 4.3.0
 zope.site = 4.4.0
@@ -65,9 +65,9 @@ zope.traversing = 4.4.1
 zope.viewlet = 4.2.1
 
 # Direct dependencies
-BTrees = 4.7.2
+BTrees = 4.8.0
 multipart = 0.2.3
-persistent = 4.6.4
+persistent = 4.7.0
 python-gettext = 4.0
 pytz = 2020.1
 setuptools = 50.3.0