launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:spokenin-zcml into launchpad:master.

Commit message:
Import SpokenIn from ZCML

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #673796 in Launchpad itself: "lp.services.worlddata.model.language unusable unless lp.services.worlddata.model.spokenin imported first"
  https://bugs.launchpad.net/launchpad/+bug/673796

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

This allows us to remove the otherwise-unused import of it in lp.services.worlddata.model.language.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:spokenin-zcml into launchpad:master.

diff --git a/lib/lp/services/worlddata/configure.zcml b/lib/lp/services/worlddata/configure.zcml
index a3a8bf7..f705487 100644
--- a/lib/lp/services/worlddata/configure.zcml
+++ b/lib/lp/services/worlddata/configure.zcml
@@ -56,6 +56,11 @@
         factory="lp.translations.browser.language.LanguageSetBreadcrumb"
         permission="zope.Public"/>
 
+    <class class=".model.spokenin.SpokenIn">
+      <allow
+          interface=".interfaces.spokenin.ISpokenIn" />
+    </class>
+
     <include package=".browser"/>
 
    <webservice:register module="lp.services.worlddata.interfaces.webservice" />
diff --git a/lib/lp/services/worlddata/model/language.py b/lib/lp/services/worlddata/model/language.py
index 9cb3c36..6b6ba5a 100644
--- a/lib/lp/services/worlddata/model/language.py
+++ b/lib/lp/services/worlddata/model/language.py
@@ -48,12 +48,6 @@ from lp.services.worlddata.interfaces.language import (
     ILanguageSet,
     TextDirection,
     )
-# XXX: JonathanLange 2010-11-10 bug=673796: It turns out this module is
-# unusable without spokenin being imported first. So, import spokenin.
-from lp.services.worlddata.model.spokenin import SpokenIn
-
-
-SpokenIn
 
 
 @implementer(ILanguage)