Launchpad itself

Merge ~cjwatson/launchpad:zcml-namespaces-renamed-page into launchpad:master

  1. Git
  2. lp:~cjwatson/launchpad
  3. zcml-namespaces-renamed-page
  4. Merge into master
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: 6f989e6810c23d4d187ac716369568624afdd6b5
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:zcml-namespaces-renamed-page
Merge into: launchpad:master
Diff against target: 406 lines (+46/-46)
7 files modified
lib/lp/answers/browser/configure.zcml (+12/-12)
lib/lp/app/browser/configure.zcml (+16/-16)
lib/lp/code/browser/configure.zcml (+7/-7)
lib/lp/registry/browser/configure.zcml (+6/-6)
lib/lp/services/webapp/doc/renamed-view.rst (+3/-3)
lib/lp/services/webapp/meta.zcml (+1/-1)
lib/lp/services/webapp/metazcml.py (+1/-1)
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+437354@code.launchpad.net

Commit message

Move ZCML renamed-page directive to lp namespace

Description of the change

As with commit 57196c1d6a220f00039e027768cc05368135f556, it makes sense to move our local `renamed-page` directive to our own namespace rather than poking it into the Zope browser namespace.

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) wrote :

Self-approving in line with other similar changes.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/lp/answers/browser/configure.zcml b/lib/lp/answers/browser/configure.zcml
2index 5e677cc..bdf02dc 100644
3--- a/lib/lp/answers/browser/configure.zcml
4+++ b/lib/lp/answers/browser/configure.zcml
5@@ -24,7 +24,7 @@
6 name="+questions"
7 permission="zope.Public"
8 />
9- <browser:renamed-page
10+ <lp:renamed-page
11 for="lp.answers.interfaces.questioncollection.IQuestionCollection"
12 name="+tickets"
13 new_name="+questions"
14@@ -43,7 +43,7 @@
15 name="+myquestions"
16 permission="launchpad.AnyPerson"
17 />
18- <browser:renamed-page
19+ <lp:renamed-page
20 for="lp.answers.interfaces.questioncollection.ISearchableByQuestionOwner"
21 name="+mytickets"
22 new_name="+myquestions"
23@@ -61,7 +61,7 @@
24 name="+by-language"
25 permission="launchpad.AnyPerson"
26 />
27- <browser:renamed-page
28+ <lp:renamed-page
29 for="lp.answers.interfaces.questiontarget.IQuestionTarget"
30 name="+unsupported"
31 new_name="+questions"
32@@ -74,7 +74,7 @@
33 class="lp.answers.browser.questiontarget.ManageAnswerContactView"
34 template="../templates/questiontarget-manage-answercontacts.pt"
35 />
36- <browser:renamed-page
37+ <lp:renamed-page
38 for="lp.answers.interfaces.questiontarget.IQuestionTarget"
39 name="+support-contact"
40 new_name="+answer-contact"
41@@ -99,7 +99,7 @@
42 class=".question.QuestionAddView"
43 permission="launchpad.AnyPerson"
44 />
45- <browser:renamed-page
46+ <lp:renamed-page
47 for="lp.answers.interfaces.questiontarget.IQuestionTarget"
48 name="+addticket"
49 new_name="+addquestion"
50@@ -405,7 +405,7 @@
51 name="+questions"
52 permission="zope.Public"
53 />
54- <browser:renamed-page
55+ <lp:renamed-page
56 for="lp.registry.interfaces.person.IPerson"
57 name="+tickets"
58 new_name="+questions"
59@@ -417,7 +417,7 @@
60 name="+answeredquestions"
61 permission="zope.Public"
62 />
63- <browser:renamed-page
64+ <lp:renamed-page
65 for="lp.registry.interfaces.person.IPerson"
66 name="+answeredtickets"
67 new_name="+answeredquestions"
68@@ -429,7 +429,7 @@
69 name="+assignedquestions"
70 permission="zope.Public"
71 />
72- <browser:renamed-page
73+ <lp:renamed-page
74 for="lp.registry.interfaces.person.IPerson"
75 name="+assignedtickets"
76 new_name="+assignedquestions"
77@@ -441,7 +441,7 @@
78 name="+commentedquestions"
79 permission="zope.Public"
80 />
81- <browser:renamed-page
82+ <lp:renamed-page
83 for="lp.registry.interfaces.person.IPerson"
84 name="+commentedtickets"
85 new_name="+commentedquestions"
86@@ -453,7 +453,7 @@
87 name="+createdquestions"
88 permission="zope.Public"
89 />
90- <browser:renamed-page
91+ <lp:renamed-page
92 for="lp.registry.interfaces.person.IPerson"
93 name="+createdtickets"
94 new_name="+createdquestions"
95@@ -465,7 +465,7 @@
96 name="+needattentionquestions"
97 permission="zope.Public"
98 />
99- <browser:renamed-page
100+ <lp:renamed-page
101 for="lp.registry.interfaces.person.IPerson"
102 name="+needattentiontickets"
103 new_name="+needattentionquestions"
104@@ -477,7 +477,7 @@
105 name="+subscribedquestions"
106 permission="zope.Public"
107 />
108- <browser:renamed-page
109+ <lp:renamed-page
110 for="lp.registry.interfaces.person.IPerson"
111 name="+subscribedtickets"
112 new_name="+subscribedquestions"
113diff --git a/lib/lp/app/browser/configure.zcml b/lib/lp/app/browser/configure.zcml
114index 29b6519..3d335d3 100644
115--- a/lib/lp/app/browser/configure.zcml
116+++ b/lib/lp/app/browser/configure.zcml
117@@ -997,7 +997,7 @@
118 attribute="__call__"
119 permission="zope.Public"
120 />
121- <browser:renamed-page
122+ <lp:renamed-page
123 for="lp.services.webapp.interfaces.ILaunchpadApplication"
124 name="+about"
125 new_name="+tour/index"
126@@ -1005,21 +1005,21 @@
127 />
128
129 <!-- Marketing material for Answers. -->
130- <browser:renamed-page
131+ <lp:renamed-page
132 for="lp.services.webapp.interfaces.ILaunchpadApplication"
133 layer="lp.answers.publisher.AnswersLayer"
134 name="+about"
135 new_name="+tour/community-support"
136 rootsite="mainsite"
137 />
138- <browser:renamed-page
139+ <lp:renamed-page
140 for="lp.services.webapp.interfaces.ILaunchpadApplication"
141 layer="lp.answers.publisher.AnswersLayer"
142 name="+faq"
143 new_name="+tour/community-support"
144 rootsite="mainsite"
145 />
146- <browser:renamed-page
147+ <lp:renamed-page
148 name="+tour"
149 new_name="+tour/community-support"
150 rootsite="mainsite"
151@@ -1028,21 +1028,21 @@
152 />
153
154 <!-- Marketing material for Blueprints. -->
155- <browser:renamed-page
156+ <lp:renamed-page
157 for="lp.services.webapp.interfaces.ILaunchpadApplication"
158 layer="lp.blueprints.publisher.BlueprintsLayer"
159 name="+about"
160 new_name="+tour/feature-tracking"
161 rootsite="mainsite"
162 />
163- <browser:renamed-page
164+ <lp:renamed-page
165 for="lp.services.webapp.interfaces.ILaunchpadApplication"
166 layer="lp.blueprints.publisher.BlueprintsLayer"
167 name="+faq"
168 new_name="+tour/feature-tracking"
169 rootsite="mainsite"
170 />
171- <browser:renamed-page
172+ <lp:renamed-page
173 name="+tour"
174 for="lp.services.webapp.interfaces.ILaunchpadApplication"
175 layer="lp.blueprints.publisher.BlueprintsLayer"
176@@ -1051,21 +1051,21 @@
177 />
178
179 <!-- Marketing material for Bugs. -->
180- <browser:renamed-page
181+ <lp:renamed-page
182 for="lp.services.webapp.interfaces.ILaunchpadApplication"
183 layer="lp.bugs.publisher.BugsLayer"
184 name="+about"
185 new_name="+tour/bugs"
186 rootsite="mainsite"
187 />
188- <browser:renamed-page
189+ <lp:renamed-page
190 for="lp.services.webapp.interfaces.ILaunchpadApplication"
191 layer="lp.bugs.publisher.BugsLayer"
192 name="+faq"
193 new_name="+tour/bugs"
194 rootsite="mainsite"
195 />
196- <browser:renamed-page
197+ <lp:renamed-page
198 name="+tour"
199 for="lp.services.webapp.interfaces.ILaunchpadApplication"
200 layer="lp.bugs.publisher.BugsLayer"
201@@ -1074,21 +1074,21 @@
202 />
203
204 <!-- Marketing material for Code. -->
205- <browser:renamed-page
206+ <lp:renamed-page
207 for="lp.services.webapp.interfaces.ILaunchpadApplication"
208 layer="lp.code.publisher.CodeLayer"
209 name="+about"
210 new_name="+tour/branch-hosting-tracking"
211 rootsite="mainsite"
212 />
213- <browser:renamed-page
214+ <lp:renamed-page
215 for="lp.services.webapp.interfaces.ILaunchpadApplication"
216 layer="lp.code.publisher.CodeLayer"
217 name="+faq"
218 new_name="+tour/branch-hosting-tracking"
219 rootsite="mainsite"
220 />
221- <browser:renamed-page
222+ <lp:renamed-page
223 name="+tour"
224 for="lp.services.webapp.interfaces.ILaunchpadApplication"
225 layer="lp.code.publisher.CodeLayer"
226@@ -1098,21 +1098,21 @@
227
228
229 <!-- Marketing material for Translations. -->
230- <browser:renamed-page
231+ <lp:renamed-page
232 for="lp.services.webapp.interfaces.ILaunchpadApplication"
233 layer="lp.translations.publisher.TranslationsLayer"
234 name="+about"
235 new_name="+tour/translation"
236 rootsite="mainsite"
237 />
238- <browser:renamed-page
239+ <lp:renamed-page
240 for="lp.services.webapp.interfaces.ILaunchpadApplication"
241 layer="lp.translations.publisher.TranslationsLayer"
242 name="+faq"
243 new_name="+tour/translation"
244 rootsite="mainsite"
245 />
246- <browser:renamed-page
247+ <lp:renamed-page
248 name="+tour"
249 for="lp.services.webapp.interfaces.ILaunchpadApplication"
250 layer="lp.translations.publisher.TranslationsLayer"
251diff --git a/lib/lp/code/browser/configure.zcml b/lib/lp/code/browser/configure.zcml
252index 51cc421..ba11a5f 100644
253--- a/lib/lp/code/browser/configure.zcml
254+++ b/lib/lp/code/browser/configure.zcml
255@@ -745,17 +745,17 @@
256 permission="zope.Public"
257 name="+branches"
258 template="../templates/person-branches.pt"/>
259- <browser:renamed-page
260+ <lp:renamed-page
261 for="lp.registry.interfaces.person.IPerson"
262 name="+ownedbranches"
263 new_name="+branches"
264 rootsite="code"/>
265- <browser:renamed-page
266+ <lp:renamed-page
267 for="lp.registry.interfaces.person.IPerson"
268 name="+registeredbranches"
269 new_name="+branches"
270 rootsite="code"/>
271- <browser:renamed-page
272+ <lp:renamed-page
273 for="lp.registry.interfaces.person.IPerson"
274 name="+subscribedbranches"
275 new_name="+branches"
276@@ -786,7 +786,7 @@
277 permission="zope.Public"
278 name="+branches"
279 template="../templates/product-branches.pt"/>
280- <browser:renamed-page
281+ <lp:renamed-page
282 for="lp.registry.interfaces.product.IProduct"
283 name="+all-branches"
284 new_name="+branches"
285@@ -1192,17 +1192,17 @@
286 name="+branches"
287 template="../templates/person-branches.pt"
288 />
289- <browser:renamed-page
290+ <lp:renamed-page
291 for="lp.registry.interfaces.personproduct.IPersonProduct"
292 name="+ownedbranches"
293 new_name="+branches"
294 rootsite="code"/>
295- <browser:renamed-page
296+ <lp:renamed-page
297 for="lp.registry.interfaces.personproduct.IPersonProduct"
298 name="+registeredbranches"
299 new_name="+branches"
300 rootsite="code"/>
301- <browser:renamed-page
302+ <lp:renamed-page
303 for="lp.registry.interfaces.personproduct.IPersonProduct"
304 name="+subscribedbranches"
305 new_name="+branches"
306diff --git a/lib/lp/registry/browser/configure.zcml b/lib/lp/registry/browser/configure.zcml
307index edc854e..2f477ef 100644
308--- a/lib/lp/registry/browser/configure.zcml
309+++ b/lib/lp/registry/browser/configure.zcml
310@@ -393,7 +393,7 @@
311 class="lp.registry.browser.project.ProjectAddQuestionView"
312 permission="launchpad.AnyPerson"
313 />
314- <browser:renamed-page
315+ <lp:renamed-page
316 name="+addticket"
317 for="lp.registry.interfaces.projectgroup.IProjectGroup"
318 new_name="+addquestion"
319@@ -1135,17 +1135,17 @@
320 permission="zope.Public"
321 template="../templates/person-related-software-navlinks.pt"
322 />
323- <browser:renamed-page
324+ <lp:renamed-page
325 name="+related-software"
326 new_name="+related-packages"
327 for="lp.registry.interfaces.person.IPerson"
328 />
329- <browser:renamed-page
330+ <lp:renamed-page
331 name="+packages"
332 new_name="+related-packages"
333 for="lp.registry.interfaces.person.IPerson"
334 />
335- <browser:renamed-page
336+ <lp:renamed-page
337 name="+projects"
338 new_name="+related-projects"
339 for="lp.registry.interfaces.person.IPerson"
340@@ -1767,7 +1767,7 @@
341 permission="zope.Public"
342 template="../templates/product-listing-detailed.pt"
343 />
344- <browser:renamed-page
345+ <lp:renamed-page
346 name="+distributions"
347 for="lp.registry.interfaces.product.IProduct"
348 new_name="+packages"
349@@ -1931,7 +1931,7 @@
350 permission="launchpad.AnyPerson"
351 template="../templates/product-new.pt"
352 />
353- <browser:renamed-page
354+ <lp:renamed-page
355 name="+new-guided"
356 new_name="+new"
357 for="lp.registry.interfaces.product.IProductSet"
358diff --git a/lib/lp/services/webapp/doc/renamed-view.rst b/lib/lp/services/webapp/doc/renamed-view.rst
359index 7eccb66..d60d807 100644
360--- a/lib/lp/services/webapp/doc/renamed-view.rst
361+++ b/lib/lp/services/webapp/doc/renamed-view.rst
362@@ -99,15 +99,15 @@ Registering from ZCML
363 ---------------------
364
365 Finally, it is possible to register RenamedView from ZCML. The
366-browser:renamed-page is available for this purpose.
367+lp:renamed-page directive is available for this purpose.
368
369 >>> from zope.configuration import xmlconfig
370 >>> zcmlcontext = xmlconfig.string(
371 ... """
372- ... <configure xmlns:browser="http://namespaces.zope.org/browser">
373+ ... <configure xmlns:lp="http://namespaces.canonical.com/lp">
374 ... <include package="zope.component" file="meta.zcml" />
375 ... <include package="lp.services.webapp" file="meta.zcml" />
376- ... <browser:renamed-page
377+ ... <lp:renamed-page
378 ... for="lp.answers.interfaces.questiontarget.IQuestionTarget"
379 ... name="+old_tickets_page"
380 ... new_name="+questions"
381diff --git a/lib/lp/services/webapp/meta.zcml b/lib/lp/services/webapp/meta.zcml
382index c541ff9..c307612 100644
383--- a/lib/lp/services/webapp/meta.zcml
384+++ b/lib/lp/services/webapp/meta.zcml
385@@ -40,7 +40,7 @@
386 />
387
388 <directive
389- namespace="http://namespaces.zope.org/browser"
390+ namespace="http://namespaces.canonical.com/lp"
391 name="renamed-page"
392 schema="lp.services.webapp.metazcml.IRenamedPageDirective"
393 handler="lp.services.webapp.metazcml.renamed_page"
394diff --git a/lib/lp/services/webapp/metazcml.py b/lib/lp/services/webapp/metazcml.py
395index 5576f9f..cae26d3 100644
396--- a/lib/lp/services/webapp/metazcml.py
397+++ b/lib/lp/services/webapp/metazcml.py
398@@ -597,7 +597,7 @@ class pages(original_pages):
399
400
401 class IRenamedPageDirective(Interface):
402- """Schema for the browser:renamed-page directive.
403+ """Schema for the lp:renamed-page directive.
404
405 Use this directive to do redirects instead of the classic way of putting a
406 redirect method in a view, hooked in by a browser:page directive.

Subscribers

People subscribed via source and target branches

to status/vote changes: