Colin Watson has proposed merging ~cjwatson/launchpad:zcml-namespaces-feeds
into launchpad:master.
Commit message:
Move ZCML feeds directive to lp namespace
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/437343
As with commit 57196c1d6a220f00039e027768cc05368135f556, it makes sense to move
our local `feeds` directive to our own namespace rather than poking it into the
Zope browser namespace.
--
Your team Launchpad code reviewers is requested to review the proposed merge of
~cjwatson/launchpad:zcml-namespaces-feeds into launchpad:master.
diff --git a/lib/lp/bugs/browser/configure.zcml b/lib/lp/bugs/browser/configure.zcml
index cb8528f..d2bf3cf 100644
--- a/lib/lp/bugs/browser/configure.zcml
+++ b/lib/lp/bugs/browser/configure.zcml
@@ -9,7 +9,7 @@
xmlns:lp="http://namespaces.canonical.com/lp";
xmlns:xmlrpc="http://namespaces.zope.org/xmlrpc";
i18n_domain="launchpad">
- <browser:feeds
+ <lp:feeds
module="lp.bugs.feed.bug"
classes="BugFeed BugTargetBugsFeed PersonBugsFeed SearchBugsFeed"
/>
diff --git a/lib/lp/code/browser/configure.zcml b/lib/lp/code/browser/configure.zcml
index c2534a3..51cc421 100644
--- a/lib/lp/code/browser/configure.zcml
+++ b/lib/lp/code/browser/configure.zcml
@@ -19,7 +19,7 @@
path_expression="string:+git"
parent_utility="lp.services.webapp.interfaces.ILaunchpadRoot"
/>
- <browser:feeds
+ <lp:feeds
module="lp.code.feed.branch"
classes="BranchFeed PersonBranchFeed ProductBranchFeed ProjectBranchFeed
PersonRevisionFeed ProductRevisionFeed ProjectRevisionFeed"
diff --git a/lib/lp/registry/browser/configure.zcml b/lib/lp/registry/browser/configure.zcml
index 57aafc2..edc854e 100644
--- a/lib/lp/registry/browser/configure.zcml
+++ b/lib/lp/registry/browser/configure.zcml
@@ -29,7 +29,7 @@
path_expression="string:projectgroups"
parent_utility="lp.services.webapp.interfaces.ILaunchpadRoot"
/>
- <browser:feeds
+ <lp:feeds
module="lp.registry.feed.announcement"
classes="LaunchpadAnnouncementsFeed TargetAnnouncementsFeed"
/>
diff --git a/lib/lp/registry/feed/announcement.py b/lib/lp/registry/feed/announcement.py
index 85d4b44..d0cf327 100644
--- a/lib/lp/registry/feed/announcement.py
+++ b/lib/lp/registry/feed/announcement.py
@@ -114,7 +114,7 @@ class LaunchpadAnnouncementsFeed(AnnouncementsFeedBase):
# webapp/metazcml.py to provide a mapping from the supported
# feed types to this class. It is a more maintainable method than simply
# listing each mapping in the zcml. The only zcml change is to add this
- # class to the list of classes in the `browser:feeds` stanza of
+ # class to the list of classes in the `lp:feeds` stanza of
# lp/services/feeds/configure.zcml.
usedfor = IFeedsApplication
diff --git a/lib/lp/services/feeds/doc/feeds.rst b/lib/lp/services/feeds/doc/feeds.rst
index dd6ea57..5cfce98 100644
--- a/lib/lp/services/feeds/doc/feeds.rst
+++ b/lib/lp/services/feeds/doc/feeds.rst
@@ -19,18 +19,18 @@ Launchpad interface, we'll define one here.
>>> from lp.services.feeds.tests.helper import IThing, Thing
-ZCML for browser:feeds
-----------------------
+ZCML for lp:feeds
+-----------------
-The zcml `browser:feeds` directive describes a feed view.
+The zcml `lp:feeds` directive describes a feed view.
>>> from zope.configuration import xmlconfig
>>> zcmlcontext = xmlconfig.string(
... """
- ... <configure xmlns:browser="http://namespaces.zope.org/browser";>
+ ... <configure xmlns:lp="http://namespaces.canonical.com/lp";>
... <include package="zope.component" file="meta.zcml" />
... <include package="lp.services.webapp" file="meta.zcml" />
- ... <browser:feeds
+ ... <lp:feeds
... module="lp.services.feeds.tests.helper"
... classes="ThingFeedView"
... />
diff --git a/lib/lp/services/webapp/meta.zcml b/lib/lp/services/webapp/meta.zcml
index 367512b..c541ff9 100644
--- a/lib/lp/services/webapp/meta.zcml
+++ b/lib/lp/services/webapp/meta.zcml
@@ -33,7 +33,7 @@
/>
<directive
- namespace="http://namespaces.zope.org/browser";
+ namespace="http://namespaces.canonical.com/lp";
name="feeds"
schema="lp.services.webapp.metazcml.IFeedsDirective"
handler="lp.services.webapp.metazcml.feeds"
_______________________________________________
Mailing list: https://launchpad.net/~launchpad-reviewers
Post to : launchpad-reviewers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~launchpad-reviewers
More help : https://help.launchpad.net/ListHelp
