← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] ~cjwatson/launchpad:testfix-lazr.enum-1.2 into launchpad:master

 

Colin Watson has proposed merging ~cjwatson/launchpad:testfix-lazr.enum-1.2 into launchpad:master.

Commit message:
Use documented lazr.enum API

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

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

PackagePublishingPocket.__metaclass__.getTermByToken relied on an undocumented interface in lazr.enum and breaks with lazr.enum 1.2.  Use the documented interface of PackagePublishingPocket.getTermByToken instead.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:testfix-lazr.enum-1.2 into launchpad:master.
diff --git a/lib/lp/soyuz/scripts/initialize_distroseries.py b/lib/lp/soyuz/scripts/initialize_distroseries.py
index 4d59be2..8ac2150 100644
--- a/lib/lp/soyuz/scripts/initialize_distroseries.py
+++ b/lib/lp/soyuz/scripts/initialize_distroseries.py
@@ -305,8 +305,7 @@ class InitializeDistroSeries:
         for parent in self.parents:
             dsp_set = getUtility(IDistroSeriesParentSet)
             if self.overlays and self.overlays[count]:
-                pocket = PackagePublishingPocket.__metaclass__.getTermByToken(
-                    PackagePublishingPocket,
+                pocket = PackagePublishingPocket.getTermByToken(
                     self.overlay_pockets[count]).value
                 component_set = getUtility(IComponentSet)
                 component = component_set[self.overlay_components[count]]