Merge lp:~jcsackett/launchpad/deprecate-official_malone into lp:launchpad

[j.c.sackett]

Deprecates usage of official_malone where possible in favor of bug_tracking_usage.

= Summary =

Replaces, where possible, usage of official_malone with the bug_tracking_usage property.

== Proposed fix ==

Where code uses official_malone to drive a decision regarding presentation or action,
update the code to use bug_tracking_usage instead, so we can use the richer data
provided by the usage enums.

== Pre-implementation notes ==

Spoke with Curtis Hovey (sinzui) and Brad Crittenden (bac).

== Implementation details ==

As in Proposed fix.

SQL queries using official_malone have been left alone until data migration occurs.

Instances where an assignment is made to official_malone, no replacement is made as the official_malone
boolean is part of the data driving bug_tracking_usage.

== Tests ==

No new tests written.

To fully test the refactor:

bin/test -m lib.lp.registry
bin/test -m lib.lp.bugs

== Demo and Q/A ==

In Launchpad.dev, nothing should crash when reviewing bugs or performing bug related actions.

There are no changes to the UX or UI, I believe everything should function in the same fashion.

= Launchpad lint =

This touched enough old files that the lint output is huge. I will fix all valid lint errors before committing, but I didn't want to pollute the diff too much nor make this MP a wall of text.

[j.c.sackett (jcsackett)]

I've noticed that the diff gets weird over time, so I'm snapshotting it near the beginning of this MP.

=== modified file 'lib/canonical/launchpad/doc/vocabularies.txt'
--- lib/canonical/launchpad/doc/vocabularies.txt 2010-02-17 11:13:06 +0000
+++ lib/canonical/launchpad/doc/vocabularies.txt 2010-08-25 14:36:51 +0000
@@ -251,9 +251,9 @@

     >>> mozilla_project = getUtility(IProjectGroupSet).getByName('mozilla')
     >>> for product in mozilla_project.products:
- ... print "%s: %s" % (product.name, product.official_malone)
- firefox: True
- thunderbird: False
+ ... print "%s: %s" % (product.name, product.bug_tracking_usage.name)
+ firefox: LAUNCHPAD
+ thunderbird: UNKNOWN

     >>> mozilla_products_vocabulary = vocabulary_registry.get(
     ... mozilla_project,'ProjectProductsUsingMalone')

=== modified file 'lib/canonical/launchpad/vocabularies/dbobjects.py'
--- lib/canonical/launchpad/vocabularies/dbobjects.py 2010-08-20 20:31:18 +0000
+++ lib/canonical/launchpad/vocabularies/dbobjects.py 2010-08-25 20:17:12 +0000
@@ -87,6 +87,7 @@
     SQLObjectVocabularyBase,
     )
 from lp.app.browser.stringformatter import FormattersAPI
+from lp.app.enums import ServiceUsage
 from lp.blueprints.interfaces.specification import SpecificationFilter
 from lp.blueprints.model.specification import Specification
 from lp.blueprints.model.sprint import Sprint
@@ -234,6 +235,7 @@
     These are branches that the user is guaranteed to be able to push
     to.
     """
+
     def __init__(self, context=None):
         """Pass a Person as context, or anything else for the current user."""
         super(HostedBranchRestrictedOnOwnerVocabulary, self).__init__(context)
@@ -341,6 +343,7 @@
     This vocabulary contains all the languages known to Launchpad,
     excluding English and non-visible languages.
     """
+
     def __contains__(self, language):
         """See `IVocabulary`.

@@ -382,7 +385,7 @@
     return SimpleVocabulary([
         SimpleTerm(product, product.name, title=product.displayname)
         for product in project.products
- if product.official_malone])
+ if product.bug_tracking_usage == ServiceUsage.LAUNCHPAD])

 class TranslationGroupVocabulary(NamedSQLObjectVocabulary):
@@ -741,7 +744,8 @@
         return Distribution.selectBy(official_malone=True).count()

     def __contains__(self, obj):
- return IDistribution.providedBy(obj) and obj.official_malone
+ return (IDistribution.providedBy(obj)
+ and obj.bug_tracking_usage == ServiceUsage.LAUNCHPAD)

     def getQuery(self):
         return None

=== modified file 'lib/lp/bugs/browser/bugalsoaffects.py'
--- lib/lp/bugs/browser/bugalsoaffects.py 2010-08-20 20:31:18 +0000
+++ lib/lp/bugs/browser/bugalsoaffects.py 2010-08-25 15:55:41 +0000
@@ -56,6 +56,7 @@
 from canonical.widgets.itemswidgets import LaunchpadRadioWidget
 from canonical.widgets.popup import SearchForUpstreamPopupWidget
 from canonical.widgets.textwidgets import StrippedTextWidget
+from lp.app.enums import ServiceUsage
 from lp.bugs.interfaces.bug import IBug
 from lp.bugs.interfaces.bugtask import (
     BugTaskImportance,
@@ -319,10 +320,11 @@
     ...

[Edwin Grubbs (edwin-grubbs)]

Hi JC,

This does not look like a fun branch, but it is very helpful. I have a
few questions and suggestions below.

-Edwin

>=== modified file 'lib/lp/bugs/browser/bugalsoaffects.py'
>--- lib/lp/bugs/browser/bugalsoaffects.py 2010-08-20 20:31:18 +0000
>+++ lib/lp/bugs/browser/bugalsoaffects.py 2010-08-25 21:42:02 +0000
>@@ -56,6 +56,7 @@
> from canonical.widgets.itemswidgets import LaunchpadRadioWidget
> from canonical.widgets.popup import SearchForUpstreamPopupWidget
> from canonical.widgets.textwidgets import StrippedTextWidget
>+from lp.app.enums import ServiceUsage
> from lp.bugs.interfaces.bug import IBug
> from lp.bugs.interfaces.bugtask import (
> BugTaskImportance,
>@@ -319,10 +320,11 @@
> if bug_watch is None:
> bug_watch = task_added.bug.addWatch(
> extracted_bugtracker, extracted_bug, self.user)
>- if not target.official_malone:
>+ if target.bug_tracking_usage != ServiceUsage.LAUNCHPAD:
> task_added.bugwatch = bug_watch
>
>- if (not target.official_malone and task_added.bugwatch is not None
>+ if (target.bug_tracking_usage != ServiceUsage.LAUNCHPAD

Whitespace at end of line.

>+ and task_added.bugwatch is not None
> and (task_added.bugwatch.bugtracker.bugtrackertype !=
> BugTrackerType.EMAILADDRESS)):
> # A remote bug task gets its status from a bug watch, so
>=== modified file 'lib/lp/bugs/browser/bugtarget.py'
>--- lib/lp/bugs/browser/bugtarget.py 2010-08-22 18:31:30 +0000
>+++ lib/lp/bugs/browser/bugtarget.py 2010-08-25 21:42:02 +0000
>@@ -96,7 +96,11 @@
> NotFoundError,
> UnexpectedFormData,
> )
>-from lp.app.interfaces.launchpad import ILaunchpadUsage
>+from lp.app.enums import ServiceUsage

lp.app.enums should be placed above lp.app.errors.

>+from lp.app.interfaces.launchpad import (
>+ ILaunchpadUsage,
>+ IServiceUsage,
>+ )
> from lp.bugs.browser.bugrole import BugRoleMixin
> from lp.bugs.browser.bugtask import BugTaskSearchListingView
> from lp.bugs.interfaces.apportjob import IProcessApportBlobJobSource
>@@ -384,7 +388,7 @@
> # actually uses Malone for its bug tracking.
> product_or_distro = self.getProductOrDistroFromContext()
> if (product_or_distro is not None and
>- not product_or_distro.official_malone):
>+ product_or_distro.bug_tracking_usage != ServiceUsage.LAUNCHPAD):
> self.setFieldError(
> 'bugtarget',
> "%s does not use Launchpad as its bug tracker " %
>@@ -426,10 +430,11 @@
> if IProjectGroup.providedBy(self.context):
> products_using_malone = [
> product for product in self.context.products
>- if product.official_malone]
>+ if product.bug_tracking_usage == ServiceUsage.LAUNCHPAD]
> return len(products_using_malone) > 0
> else:
>- return self.getMainContext().official_malone
>+ bug_tracking_usage = self.getMainContext().bug_tracking_usage
>+ return bug_tracking_usage == ServiceUsage.LAUNCHPAD

Does this mean that Projec...

review: Needs Information (code)

[j.c.sackett (jcsackett)]

Updated diff:

=== modified file 'lib/lp/bugs/browser/bugalsoaffects.py'
--- lib/lp/bugs/browser/bugalsoaffects.py 2010-08-25 15:56:26 +0000
+++ lib/lp/bugs/browser/bugalsoaffects.py 2010-08-26 15:10:32 +0000
@@ -323,7 +323,7 @@
             if target.bug_tracking_usage != ServiceUsage.LAUNCHPAD:
                 task_added.bugwatch = bug_watch

- if (target.bug_tracking_usage != ServiceUsage.LAUNCHPAD
+ if (target.bug_tracking_usage != ServiceUsage.LAUNCHPAD
             and task_added.bugwatch is not None
             and (task_added.bugwatch.bugtracker.bugtrackertype !=
                  BugTrackerType.EMAILADDRESS)):

=== modified file 'lib/lp/bugs/browser/bugtarget.py'
--- lib/lp/bugs/browser/bugtarget.py 2010-08-25 21:10:35 +0000
+++ lib/lp/bugs/browser/bugtarget.py 2010-08-26 15:11:23 +0000
@@ -92,11 +92,11 @@
     GhostWidget,
     ProductBugTrackerWidget,
     )
+from lp.app.enums import ServiceUsage
 from lp.app.errors import (
     NotFoundError,
     UnexpectedFormData,
     )
-from lp.app.enums import ServiceUsage
 from lp.app.interfaces.launchpad import (
     ILaunchpadUsage,
     IServiceUsage,

=== modified file 'lib/lp/bugs/browser/distribution_upstream_bug_report.py'
--- lib/lp/bugs/browser/distribution_upstream_bug_report.py 2010-08-25 17:45:19 +0000
+++ lib/lp/bugs/browser/distribution_upstream_bug_report.py 2010-08-26 15:42:38 +0000
@@ -146,7 +146,7 @@
         - dssp: an IDistributionSeriesSourcepackage
         - product: an IProduct
         - bugtracker: convenience holder for the product's bugtracker
- - bug_tracking_usage: convenience enum for
+ - bug_tracking_usage: convenience enum for
             IProduct.bug_tracking_usage
         - *_url: convenience URLs
     """
@@ -166,6 +166,7 @@

         self.bug_tracking_usage = product.bug_tracking_usage

+ # If a product is specified, build some convenient links to
         # pages which allow filling out required information. The
         # template ensures they are only visible to people who can
         # actually change the product.

=== modified file 'lib/lp/bugs/templates/distribution-upstream-bug-report.pt'
--- lib/lp/bugs/templates/distribution-upstream-bug-report.pt 2010-08-24 20:11:37 +0000
+++ lib/lp/bugs/templates/distribution-upstream-bug-report.pt 2010-08-26 15:45:23 +0000
@@ -166,10 +166,12 @@
                 </td>
               </tal:has-bugtracker>
               <tal:has-no-bugtracker condition="not: item/bugtracker">
- <td tal:condition="item/bug_tracking_usage/enumvalue:LAUNCHPAD" align="center">
+ <td tal:condition="item/bug_tracking_usage/enumvalue:LAUNCHPAD"
+ align="center">
                     <img src="/@@/yes" title="Launchpad" />
                 </td>
- <td tal:condition="not: item/bug_tracking_usage/enumvalue:LAUNCHPAD" align="center">
+ <td tal:condition="not: item/bug_tracking_usage/enumvalue:LAUNCHPAD"
+ align="center">
                     <img src="/@@/no" title="Unknown" />
                     <a tal:condition="item/product/required:launchpad.Edit"
                        tal:attributes="href it...

[j.c.sackett (jcsackett)]

>> + if (target.bug_tracking_usage != ServiceUsage.LAUNCHPAD
>
>
> Whitespace at end of line.

Taken care of.

>> -from lp.app.interfaces.launchpad import ILaunchpadUsage
>> +from lp.app.enums import ServiceUsage
>
>
> lp.app.enums should be placed above lp.app.errors.

Agreed, and done.

>> @@ -426,10 +430,11 @@
>> if IProjectGroup.providedBy(self.context):
>> products_using_malone = [
>> product for product in self.context.products
>> - if product.official_malone]
>> + if product.bug_tracking_usage == ServiceUsage.LAUNCHPAD]
>> return len(products_using_malone) > 0
>> else:
>> - return self.getMainContext().official_malone
>> + bug_tracking_usage = self.getMainContext().bug_tracking_usage
>> + return bug_tracking_usage == ServiceUsage.LAUNCHPAD
>
>
>
> Does this mean that ProjectGroup will never implement IServiceUsage?

This may be ignorance of a better solution on my part, but as ProjectGroup didn't implement ILaunchpadUsage
(where the official_* attrs are largely defined) I didn't think it needed to implement IServiceUsage; at least not
within the scope of this branch. The mods above get to the usage_enum in the same way that the official_bool
was retrieved.

>> === modified file 'lib/lp/bugs/browser/bugtask.py'
>> --- lib/lp/bugs/browser/bugtask.py 2010-08-22 18:31:30 +0000
>> +++ lib/lp/bugs/browser/bugtask.py 2010-08-25 21:42:02 +0000
>> @@ -193,6 +193,7 @@
>> )
>> from canonical.widgets.project import ProjectScopeWidget
>> from lp.answers.interfaces.questiontarget import IQuestionTarget
>> +from lp.app.enums import ServiceUsage
>> from lp.app.errors import (
>> NotFoundError,
>> UnexpectedFormData,
>> @@ -1668,7 +1669,7 @@
>>
>> new_product = data.get('product')
>> if (old_product is None or old_product == new_product or
>> - not bugtask.pillar.official_malone):
>> + bugtask.pillar.bug_tracking_usage != ServiceUsage.LAUNCHPAD):
>> # Either the product wasn't changed, we're dealing with a #
>> # distro task, or the bugtask's product doesn't use Launchpad,
>> # which means the product can't be changed.
>
>
> The comment and the the if-statement don't make sense. Why would we
> care if the current bugtask.pillar doesn't use LP Bugs? It should check
> if the new_product uses LP Bugs. Can you ask the bugs team about this?

According to deryck, that's because it's checking the bugtask target, which may not actually be
old_ or new_ product and may be a distro.

There was some confusion on this point; I believe jml and deryck are still
looking into it, but seemed to believe it was correct.

>> === modified file 'lib/lp/bugs/browser/distribution_upstream_bug_report.py'
>> --- lib/lp/bugs/browser/distribution_upstream_bug_report.py 2010-08-20 20:31:18 +0000
>> +++ lib/lp/bugs/browser/distribution_upstream_bug_report.py 2010-08-25 21:42:02 +0000
>> @@ -17,6 +17,7 @@
>> LaunchpadView,
>> )
>> from canonical.launchpad.webapp.url import urlappend
>> +from lp.app.enums import ServiceUsage
>> from lp.bugs.browser.bugtask import get_bugl...

[Edwin Grubbs (edwin-grubbs)]

Hi JC,

Thanks for making the changes. I just have one more item that should be changed before this lands.

-Edwin

> === modified file 'lib/lp/registry/adapters.py'
> --- lib/lp/registry/adapters.py 2010-08-24 20:09:56 +0000
> +++ lib/lp/registry/adapters.py 2010-08-26 15:53:05 +0000
> @@ -26,14 +34,12 @@
> )
>
>
> +@implementer(IServiceUsage)
> +@adapter(IDistroSeries)
> def distroseries_to_launchpadusage(distroseries):
> """Adapts `IDistroSeries` object to `ILaunchpadUsage`."""
> return distroseries.distribution
>
> -def distroseries_to_serviceusage(distroseries):
> - """Adapts `IDistroSeries` object to `IServiceUsage`."""
> - return distroseries.distribution
> -
> def person_from_principal(principal):
> """Adapt `ILaunchpadPrincipal` to `IPerson`."""
> if ILaunchpadPrincipal.providedBy(principal):

I like that you are trying to reuse the function, but I think it will confuse someone horribly if @implementer doesn't match the function name or the docstring. You might be able to get this to work with:

@implementer(ILaunchpadUsage, IServiceUsage)

and then the function name should be changed to distroseries_to_distribution(), which describes the object it's returning as opposed to the interface it's adapting to. The zcml could be trimmed for ILaunchpadUsage then also.

If this doesn't work easily, just add the old function back and put @implementer and @adapter above that.

[Edwin Grubbs (edwin-grubbs)]

review: Approve (code)

=== modified file 'lib/canonical/launchpad/doc/vocabularies.txt'
--- lib/canonical/launchpad/doc/vocabularies.txt	2010-08-26 08:02:08 +0000
+++ lib/canonical/launchpad/doc/vocabularies.txt	2010-09-02 19:34:49 +0000
@@ -259,9 +259,9 @@
 
     >>> mozilla_project = getUtility(IProjectGroupSet).getByName('mozilla')
     >>> for product in mozilla_project.products:
-    ...     print "%s: %s" % (product.name, product.official_malone)
-    firefox: True
-    thunderbird: False
+    ...     print "%s: %s" % (product.name, product.bug_tracking_usage.name)
+    firefox: LAUNCHPAD
+    thunderbird: UNKNOWN
 
     >>> mozilla_products_vocabulary = vocabulary_registry.get(
     ...     mozilla_project,'ProjectProductsUsingMalone')

=== modified file 'lib/canonical/launchpad/vocabularies/dbobjects.py'
--- lib/canonical/launchpad/vocabularies/dbobjects.py	2010-08-26 08:02:08 +0000
+++ lib/canonical/launchpad/vocabularies/dbobjects.py	2010-09-02 19:34:49 +0000
@@ -85,6 +85,7 @@
     SQLObjectVocabularyBase,
     )
 from lp.app.browser.stringformatter import FormattersAPI
+from lp.app.enums import ServiceUsage
 from lp.blueprints.model.specification import Specification
 from lp.blueprints.model.sprint import Sprint
 from lp.bugs.interfaces.bugtask import IBugTask
@@ -231,6 +232,7 @@
     These are branches that the user is guaranteed to be able to push
     to.
     """
+
     def __init__(self, context=None):
         """Pass a Person as context, or anything else for the current user."""
         super(HostedBranchRestrictedOnOwnerVocabulary, self).__init__(context)
@@ -338,6 +340,7 @@
     This vocabulary contains all the languages known to Launchpad,
     excluding English and non-visible languages.
     """
+
     def __contains__(self, language):
         """See `IVocabulary`.
 
@@ -379,7 +382,7 @@
     return SimpleVocabulary([
         SimpleTerm(product, product.name, title=product.displayname)
         for product in project.products
-        if product.official_malone])
+        if product.bug_tracking_usage == ServiceUsage.LAUNCHPAD])
 
 
 class TranslationGroupVocabulary(NamedSQLObjectVocabulary):
@@ -413,14 +416,12 @@
         if context.productseries != None:
             self._filter = AND(
                 POTemplate.iscurrent == True,
-                POTemplate.productseries == context.productseries
-            )
+                POTemplate.productseries == context.productseries)
         else:
             self._filter = AND(
                 POTemplate.iscurrent == True,
                 POTemplate.distroseries == context.distroseries,
-                POTemplate.sourcepackagename == context.sourcepackagename
-            )
+                POTemplate.sourcepackagename == context.sourcepackagename)
         super(TranslationTemplateVocabulary, self).__init__(context)
 
     def toTerm(self, obj):
@@ -661,7 +662,8 @@
         return Distribution.selectBy(official_malone=True).count()
 
     def __contains__(self, obj):
-        return IDistribution.providedBy(obj) and obj.official_malone
+        return (IDistribution.providedBy(obj)
+                and obj.bug_tracking_usage == ServiceUsage.LAUNCHPAD)
 
     def getQuery(self):
         return None

=== modified file 'lib/lp/bugs/browser/bugalsoaffects.py'
--- lib/lp/bugs/browser/bugalsoaffects.py	2010-08-20 20:31:18 +0000
+++ lib/lp/bugs/browser/bugalsoaffects.py	2010-09-02 19:34:49 +0000
@@ -56,6 +56,7 @@
 from canonical.widgets.itemswidgets import LaunchpadRadioWidget
 from canonical.widgets.popup import SearchForUpstreamPopupWidget
 from canonical.widgets.textwidgets import StrippedTextWidget
+from lp.app.enums import ServiceUsage
 from lp.bugs.interfaces.bug import IBug
 from lp.bugs.interfaces.bugtask import (
     BugTaskImportance,
@@ -319,10 +320,11 @@
             if bug_watch is None:
                 bug_watch = task_added.bug.addWatch(
                     extracted_bugtracker, extracted_bug, self.user)
-            if not target.official_malone:
+            if target.bug_tracking_usage != ServiceUsage.LAUNCHPAD:
                 task_added.bugwatch = bug_watch
 
-        if (not target.official_malone and task_added.bugwatch is not None
+        if (target.bug_tracking_usage != ServiceUsage.LAUNCHPAD
+            and task_added.bugwatch is not None
             and (task_added.bugwatch.bugtracker.bugtrackertype !=
                  BugTrackerType.EMAILADDRESS)):
             # A remote bug task gets its status from a bug watch, so
@@ -371,7 +373,7 @@
 
         if (not bug_url and
             not self.request.get('ignore_missing_remote_bug') and
-            not target.official_malone):
+            target.bug_tracking_usage != ServiceUsage.LAUNCHPAD):
             # We have no URL for the remote bug and the target does not use
             # Launchpad for bug tracking, so we warn the user this is not
             # optimal and ask for his confirmation.
@@ -404,7 +406,7 @@
         """
         target = self.getTarget(data)
         bug_url = data.get('bug_url')
-        if bug_url and target.official_malone:
+        if bug_url and target.bug_tracking_usage == ServiceUsage.LAUNCHPAD:
             self.addError(
                 "Bug watches can not be added for %s, as it uses Launchpad"
                 " as its official bug tracker. Alternatives are to add a"

=== modified file 'lib/lp/bugs/browser/bugtarget.py'
--- lib/lp/bugs/browser/bugtarget.py	2010-08-22 18:31:30 +0000
+++ lib/lp/bugs/browser/bugtarget.py	2010-09-02 19:34:49 +0000
@@ -92,11 +92,15 @@
     GhostWidget,
     ProductBugTrackerWidget,
     )
+from lp.app.enums import ServiceUsage
 from lp.app.errors import (
     NotFoundError,
     UnexpectedFormData,
     )
-from lp.app.interfaces.launchpad import ILaunchpadUsage
+from lp.app.interfaces.launchpad import (
+    ILaunchpadUsage,
+    IServiceUsage,
+    )
 from lp.bugs.browser.bugrole import BugRoleMixin
 from lp.bugs.browser.bugtask import BugTaskSearchListingView
 from lp.bugs.interfaces.apportjob import IProcessApportBlobJobSource
@@ -384,7 +388,7 @@
         # actually uses Malone for its bug tracking.
         product_or_distro = self.getProductOrDistroFromContext()
         if (product_or_distro is not None and
-            not product_or_distro.official_malone):
+            product_or_distro.bug_tracking_usage != ServiceUsage.LAUNCHPAD):
             self.setFieldError(
                 'bugtarget',
                 "%s does not use Launchpad as its bug tracker " %
@@ -426,10 +430,11 @@
         if IProjectGroup.providedBy(self.context):
             products_using_malone = [
                 product for product in self.context.products
-                if product.official_malone]
+                if product.bug_tracking_usage == ServiceUsage.LAUNCHPAD]
             return len(products_using_malone) > 0
         else:
-            return self.getMainContext().official_malone
+            bug_tracking_usage = self.getMainContext().bug_tracking_usage
+            return bug_tracking_usage == ServiceUsage.LAUNCHPAD
 
     def getMainContext(self):
         if IDistributionSourcePackage.providedBy(self.context):
@@ -1084,7 +1089,7 @@
     def products_using_malone(self):
         return [
             product for product in self.context.products
-            if product.official_malone]
+            if product.bug_tracking_usage == ServiceUsage.LAUNCHPAD]
 
     @property
     def default_product(self):
@@ -1252,8 +1257,8 @@
 
         :returns: boolean
         """
-        launchpad_usage = ILaunchpadUsage(self.context)
-        return launchpad_usage.official_malone
+        service_usage = IServiceUsage(self.context)
+        return service_usage.bug_tracking_usage == ServiceUsage.LAUNCHPAD
 
     @property
     def external_bugtracker(self):

=== modified file 'lib/lp/bugs/browser/bugtask.py'
--- lib/lp/bugs/browser/bugtask.py	2010-08-31 18:15:15 +0000
+++ lib/lp/bugs/browser/bugtask.py	2010-09-02 19:34:49 +0000
@@ -119,15 +119,11 @@
     SimpleVocabulary,
     )
 from zope.security.interfaces import Unauthorized
-from zope.security.proxy import (
-    isinstance as zope_isinstance,
-    removeSecurityProxy,
-    )
+from zope.security.proxy import isinstance as zope_isinstance
 from zope.traversing.interfaces import IPathAdapter
 
 from canonical.cachedproperty import cachedproperty
 from canonical.config import config
-from canonical.database.sqlbase import cursor
 from canonical.launchpad import (
     _,
     helpers,
@@ -193,6 +189,7 @@
     )
 from canonical.widgets.project import ProjectScopeWidget
 from lp.answers.interfaces.questiontarget import IQuestionTarget
+from lp.app.enums import ServiceUsage
 from lp.app.errors import (
     NotFoundError,
     UnexpectedFormData,
@@ -275,6 +272,7 @@
                 PersonFormatterAPI(context.assignee).link(None))
     return render
 
+
 @component.adapter(IBugTask, IReference, IWebServiceClientRequest)
 @implementer(IFieldHTMLRenderer)
 def bugtarget_renderer(context, field, request):
@@ -289,6 +287,7 @@
         return html
     return render
 
+
 def unique_title(title):
     """Canonicalise a message title to help identify messages with new
     information in their titles.
@@ -1085,7 +1084,7 @@
             activity_and_comments.append({
                 'activity': activity_dict,
                 'date': date,
-                'person': activity_dict[0]['activity'][0].person
+                'person': activity_dict[0]['activity'][0].person,
                 })
 
         activity_and_comments.sort(key=itemgetter('date'))
@@ -1671,7 +1670,7 @@
 
         new_product = data.get('product')
         if (old_product is None or old_product == new_product or
-            not bugtask.pillar.official_malone):
+            bugtask.pillar.bug_tracking_usage != ServiceUsage.LAUNCHPAD):
             # Either the product wasn't changed, we're dealing with a #
             # distro task, or the bugtask's product doesn't use Launchpad,
             # which means the product can't be changed.
@@ -1826,9 +1825,11 @@
                 #     Launchpad status, but it's not trivial to do at the
                 #     moment. I will fix this later.
                 bugtask.transitionToStatus(
-                    BugTaskStatus.UNKNOWN, bug_importer)
+                    BugTaskStatus.UNKNOWN,
+                    bug_importer)
                 bugtask.transitionToImportance(
-                    BugTaskImportance.UNKNOWN,  bug_importer)
+                    BugTaskImportance.UNKNOWN,
+                    bug_importer)
                 bugtask.transitionToAssignee(None)
 
         if changed:
@@ -1997,7 +1998,7 @@
         """
         if not IProduct.providedBy(self.context):
             return None
-        if self.context.official_malone:
+        if self.context.bug_tracking_usage == ServiceUsage.LAUNCHPAD:
             return None
         return "%s?field.status_upstream=pending_bugwatch" % (
             canonical_url(self.context, view_name='+bugs'))
@@ -2084,7 +2085,7 @@
         """
         if not IProduct.providedBy(self.context):
             return None
-        if self.context.official_malone:
+        if self.context.bug_tracking_usage == ServiceUsage.LAUNCHPAD:
             return None
         params = get_default_search_params(self.user)
         params.pending_bugwatch_elsewhere = True
@@ -2362,9 +2363,12 @@
         bugtask_listing_item.review_action_widget = CustomWidgetFactory(
             NominationReviewActionWidget)
         setUpWidget(
-            bugtask_listing_item, 'review_action',
-            review_action_field, IInputWidget,
-            value=NominatedBugReviewAction.NO_CHANGE, context=bug_nomination)
+            bugtask_listing_item,
+            'review_action',
+            review_action_field,
+            IInputWidget,
+            value=NominatedBugReviewAction.NO_CHANGE,
+            context=bug_nomination)
 
         return bugtask_listing_item
 
@@ -2916,7 +2920,7 @@
 
             if fieldname != "orderby":
                 sortlink += "%s&" % urllib.urlencode(
-                    {fieldname : fieldvalue}, doseq=True)
+                    {fieldname: fieldvalue}, doseq=True)
 
         sorted, ascending = self._getSortStatus(colname)
         if sorted and ascending:
@@ -3000,7 +3004,7 @@
         """Is the context a Product that does not use Malone?"""
         return (
             IProduct.providedBy(self.context)
-            and not self.context.official_malone)
+            and self.context.bug_tracking_usage != ServiceUsage.LAUNCHPAD)
 
     def _upstreamContext(self):
         """Is this page being viewed in an upstream context?
@@ -3068,7 +3072,6 @@
             return None
 
 
-
 class BugNominationsView(BugTaskSearchListingView):
     """View for accepting/declining bug nominations."""
 
@@ -3132,8 +3135,7 @@
                 declined += 1
             else:
                 raise AssertionError(
-                    'Unknown NominatedBugReviewAction: %r' % (
-                        review_action,))
+                    'Unknown NominatedBugReviewAction: %r' % review_action)
 
         if accepted > 0:
             self.request.response.addInfoNotification(
@@ -3200,7 +3202,7 @@
         else:
             raise AssertionError('Uknown context type: %s' % self.context)
 
-        return u"".join("%d\n" % bug_id for bug_id in 
+        return u"".join("%d\n" % bug_id for bug_id in
             getUtility(IBugTaskSet).searchBugIds(search_params))
 
 
@@ -3373,8 +3375,7 @@
                 self._getTableRowView(
                     nomination, is_converted_to_question, False)
                 for nomination in target_nominations
-                if nomination.status != BugNominationStatus.APPROVED
-                )
+                if nomination.status != BugNominationStatus.APPROVED)
 
         # Fill the ValidPersonOrTeamCache cache (using getValidPersons()),
         # so that checking person.is_valid_person, when rendering the
@@ -3852,6 +3853,7 @@
 
 class BugTaskExpirableListingView(LaunchpadView):
     """View for listing Incomplete bugs that can expire."""
+
     @property
     def can_show_expirable_bugs(self):
         """Return True or False if expirable bug listing can be shown."""

=== modified file 'lib/lp/bugs/browser/distribution_upstream_bug_report.py'
--- lib/lp/bugs/browser/distribution_upstream_bug_report.py	2010-08-20 20:31:18 +0000
+++ lib/lp/bugs/browser/distribution_upstream_bug_report.py	2010-09-02 19:34:49 +0000
@@ -6,8 +6,8 @@
 __metaclass__ = type
 
 __all__ = [
-    'DistributionUpstreamBugReport'
-]
+    'DistributionUpstreamBugReport',
+    ]
 
 from operator import attrgetter
 
@@ -17,6 +17,7 @@
     LaunchpadView,
     )
 from canonical.launchpad.webapp.url import urlappend
+from lp.app.enums import ServiceUsage
 from lp.bugs.browser.bugtask import get_buglisting_search_filter_url
 
 # TODO: fix column sorting to work for the different colspans, or
@@ -145,9 +146,11 @@
         - dssp: an IDistributionSeriesSourcepackage
         - product: an IProduct
         - bugtracker: convenience holder for the product's bugtracker
-        - official_malone: convenience boolean for IProduct.official_malone
+        - bug_tracking_usage: convenience enum for
+            IProduct.bug_tracking_usage
         - *_url: convenience URLs
     """
+
     def __init__(self, dsp, dssp, product, open_bugs, triaged_bugs,
                  upstream_bugs, watched_bugs, bugs_with_upstream_patches):
         BugReportData.__init__(self, open_bugs, triaged_bugs, upstream_bugs,
@@ -162,9 +165,12 @@
         self.open_bugs_url = urlappend(
             dsp_bugs_url, get_buglisting_search_filter_url())
 
-        self.official_malone = bool(product and product.official_malone)
-        self.branch = (
-            product and product.development_focus.branch)
+        if product is not None:
+            self.bug_tracking_usage = product.bug_tracking_usage
+            self.branch = product.development_focus.branch
+        else:
+            self.bug_tracking_usage = ServiceUsage.UNKNOWN
+            self.branch = None
 
         # If a product is specified, build some convenient links to
         # pages which allow filling out required information. The
@@ -180,7 +186,7 @@
             # Create a 'bugtracker_name' attribute for searching.
             if self.bugtracker is not None:
                 self.bugtracker_name = self.bugtracker.title
-            elif self.product.official_malone:
+            elif self.product.bug_tracking_usage == ServiceUsage.LAUNCHPAD:
                 self.bugtracker_name = 'Launchpad'
             else:
                 self.bugtracker_name = None
@@ -374,4 +380,3 @@
                 dsp, dssp, product, open, triaged, upstream, watched,
                 bugs_with_upstream_patches)
             self._data.append(item)
-

=== modified file 'lib/lp/bugs/browser/tests/bugtask-adding-views.txt'
--- lib/lp/bugs/browser/tests/bugtask-adding-views.txt	2010-07-26 12:49:23 +0000
+++ lib/lp/bugs/browser/tests/bugtask-adding-views.txt	2010-09-02 19:34:49 +0000
@@ -224,8 +224,8 @@
 offical bug tracker.
 
     >>> evolution_task = bug_four.bugtasks[0]
-    >>> evolution_task.target.official_malone
-    True
+    >>> evolution_task.target.bug_tracking_usage
+    <DBItem ServiceUsage.LAUNCHPAD, (20) Launchpad>
 
     >>> transaction.commit()
 
@@ -275,8 +275,8 @@
 are set to the default values.
 
     >>> alsa_task = bug_four.bugtasks[0]
-    >>> alsa_task.target.official_malone
-    False
+    >>> alsa_task.target.bug_tracking_usage
+    <DBItem ServiceUsage.UNKNOWN, (10) Unknown>
     >>> alsa_task.status.title
     'New'
     >>> alsa_task.importance.title
@@ -368,8 +368,8 @@
     >>> alsa_task = bug_four.bugtasks[0]
     >>> alsa_task.bugtargetname
     u'alsa-utils'
-    >>> alsa_task.product.official_malone
-    False
+    >>> alsa_task.product.bug_tracking_usage
+    <DBItem ServiceUsage.UNKNOWN, (10) Unknown>
     >>> alsa_task.bugwatch == bug_four.watches[0]
     True
 

=== modified file 'lib/lp/bugs/browser/tests/test_bugtarget_configure.py'
--- lib/lp/bugs/browser/tests/test_bugtarget_configure.py	2010-08-20 20:31:18 +0000
+++ lib/lp/bugs/browser/tests/test_bugtarget_configure.py	2010-09-02 19:34:49 +0000
@@ -6,6 +6,7 @@
 __metaclass__ = type
 
 from canonical.testing import DatabaseFunctionalLayer
+from lp.app.enums import ServiceUsage
 from lp.testing import (
     login_person,
     TestCaseWithFactory,
@@ -59,7 +60,9 @@
         self.assertEqual([], view.errors)
         self.assertEqual(self.owner, self.product.bug_supervisor)
         self.assertEqual(self.owner, self.product.security_contact)
-        self.assertTrue(self.product.official_malone)
+        self.assertEqual(
+            ServiceUsage.LAUNCHPAD,
+            self.product.bug_tracking_usage)
         self.assertTrue(self.product.enable_bug_expiration)
         self.assertEqual('sf-boing', self.product.remote_product)
         self.assertEqual('guidelines', self.product.bug_reporting_guidelines)

=== modified file 'lib/lp/bugs/model/bug.py'
--- lib/lp/bugs/model/bug.py	2010-08-31 23:22:19 +0000
+++ lib/lp/bugs/model/bug.py	2010-09-02 19:34:49 +0000
@@ -108,6 +108,7 @@
     MAIN_STORE,
     )
 from lp.answers.interfaces.questiontarget import IQuestionTarget
+from lp.app.enums import ServiceUsage
 from lp.app.errors import (
     NotFoundError,
     UserCannotUnsubscribePerson,
@@ -1198,7 +1199,7 @@
         if len(non_invalid_bugtasks) != 1:
             return None
         [valid_bugtask] = non_invalid_bugtasks
-        if valid_bugtask.pillar.official_malone:
+        if valid_bugtask.pillar.bug_tracking_usage == ServiceUsage.LAUNCHPAD:
             return valid_bugtask
         else:
             return None

=== modified file 'lib/lp/bugs/model/bugtask.py'
--- lib/lp/bugs/model/bugtask.py	2010-08-30 19:30:45 +0000
+++ lib/lp/bugs/model/bugtask.py	2010-09-02 19:34:49 +0000
@@ -17,7 +17,8 @@
     'bugtask_sort_key',
     'get_bug_privacy_filter',
     'get_related_bugtasks_search_params',
-    'search_value_to_where_condition']
+    'search_value_to_where_condition',
+    ]
 
 
 import datetime
@@ -92,6 +93,7 @@
     IStoreSelector,
     MAIN_STORE,
     )
+from lp.app.enums import ServiceUsage
 from lp.app.errors import NotFoundError
 from lp.bugs.interfaces.bug import IBugSet
 from lp.bugs.interfaces.bugattachment import BugAttachmentType
@@ -460,13 +462,14 @@
         sourcepackagename=self.sourcepackagename,
         distribution=self.distribution,
         distroseries=self.distroseries)
-    utility_iface = {
+    utility_iface_dict = {
         'productID': IProductSet,
         'productseriesID': IProductSeriesSet,
         'sourcepackagenameID': ISourcePackageNameSet,
         'distributionID': IDistributionSet,
         'distroseriesID': IDistroSeriesSet,
-        }[attr]
+        }
+    utility_iface = utility_iface_dict[attr]
     if value is None:
         target_params[attr[:-2]] = None
     else:
@@ -655,7 +658,7 @@
     # one thing they often have to filter for is completeness. We maintain
     # this single canonical query string here so that it does not have to be
     # cargo culted into Product, Distribution, ProductSeries etc
-    completeness_clause =  """
+    completeness_clause = """
         BugTask.status IN ( %s )
         """ % ','.join([str(a.value) for a in RESOLVED_BUGTASK_STATUSES])
 
@@ -845,7 +848,7 @@
         """See `IBugTask`"""
         # XXX sinzui 2007-10-04 bug=149009:
         # This property is not needed. Code should inline this implementation.
-        return self.pillar.official_malone
+        return (self.pillar.bug_tracking_usage == ServiceUsage.LAUNCHPAD)
 
     def transitionToMilestone(self, new_milestone, user):
         """See `IBugTask`."""
@@ -1178,7 +1181,7 @@
         if IUpstreamBugTask.providedBy(self):
             header_value = 'product=%s;' % self.target.name
         elif IProductSeriesBugTask.providedBy(self):
-            header_value = 'product=%s; productseries=%s;' %  (
+            header_value = 'product=%s; productseries=%s;' % (
                 self.productseries.product.name, self.productseries.name)
         elif IDistroBugTask.providedBy(self):
             header_value = ((
@@ -2219,7 +2222,7 @@
                     (BugTask, Product, SourcePackageName, Bug),
                     AutoTables(SQL("1=1"), tables),
                     query)
-                decorator=lambda row:bugtask_decorator(row[0])
+                decorator=lambda row: bugtask_decorator(row[0])
             resultset.order_by(orderby)
             return DecoratedResultSet(resultset, result_decorator=decorator)
 

=== modified file 'lib/lp/bugs/templates/bug-create-question.pt'
--- lib/lp/bugs/templates/bug-create-question.pt	2009-08-31 09:58:28 +0000
+++ lib/lp/bugs/templates/bug-create-question.pt	2010-09-02 19:34:49 +0000
@@ -17,7 +17,7 @@
                 A question was already created from this bug.
               </tal:question>
               <tal:uses-malone
-                condition="not: context/pillar/official_malone">
+                condition="not: context/pillar/bug_tracking_usage/enumvalue:LAUNCHPAD">
                 <tal:target
                   replace="context/target/displayname">Firefox</tal:target>
                 does not use Launchpad to track bugs.

=== modified file 'lib/lp/bugs/templates/bugtarget-macros-filebug.pt'
--- lib/lp/bugs/templates/bugtarget-macros-filebug.pt	2010-07-01 06:14:05 +0000
+++ lib/lp/bugs/templates/bugtarget-macros-filebug.pt	2010-09-02 19:34:49 +0000
@@ -298,7 +298,7 @@
           </p>
         </tal:singular>
         <ul class="product-bug-options" tal:repeat="product context/products">
-          <li condition="product/official_malone">
+          <li condition="product/bug_tracking_usage/enumvalue:LAUNCHPAD">
             <tal:link replace="structure product/fmt:link" />
             <ul class="bulleted">
               <tal:external-tracker

=== modified file 'lib/lp/bugs/templates/bugtask-requestfix-upstream.pt'
--- lib/lp/bugs/templates/bugtask-requestfix-upstream.pt	2010-07-23 16:00:36 +0000
+++ lib/lp/bugs/templates/bugtask-requestfix-upstream.pt	2010-09-02 19:34:49 +0000
@@ -50,7 +50,7 @@
         </div>
       </div>
 
-      <div id="upstream-text" tal:condition="not: product/official_malone"
+      <div id="upstream-text" tal:condition="not: product/bug_tracking_usage/enumvalue:LAUNCHPAD"
           tal:define="widgets view/bugwatch_widgets;
                       bugtracker product/getExternalBugTracker">
         <p tal:condition="bugtracker">
@@ -156,14 +156,14 @@
       </p>
 
       <tal:no_bug_supervisor tal:condition="not:product/bug_supervisor">
-        <p tal:condition="product/official_malone">
+        <p tal:condition="product/bug_tracking_usage/enumvalue:LAUNCHPAD">
           <a tal:replace="structure product/owner/fmt:link">Sample Person</a>, the
              <tal:product tal:replace="product/displayname">Firefox</tal:product>
              registrant, will be notified about this bug.
 
         </p>
 
-        <p tal:condition="not: product/official_malone">
+        <p tal:condition="not: product/bug_tracking_usage/enumvalue:LAUNCHPAD">
           There is no bug supervisor for
           <tal:product tal:replace="product/displayname">Firefox</tal:product>.
           This means that there is nobody upstream we can notify about

=== modified file 'lib/lp/bugs/templates/distribution-upstream-bug-report.pt'
--- lib/lp/bugs/templates/distribution-upstream-bug-report.pt	2010-02-16 17:59:59 +0000
+++ lib/lp/bugs/templates/distribution-upstream-bug-report.pt	2010-09-02 19:34:49 +0000
@@ -166,10 +166,12 @@
                 </td>
               </tal:has-bugtracker>
               <tal:has-no-bugtracker condition="not: item/bugtracker">
-                <td tal:condition="item/official_malone" align="center">
+                <td tal:condition="item/bug_tracking_usage/enumvalue:LAUNCHPAD"
+                  align="center">
                     <img src="/@@/yes" title="Launchpad" />
                 </td>
-                <td tal:condition="not: item/official_malone" align="center">
+                <td tal:condition="not: item/bug_tracking_usage/enumvalue:LAUNCHPAD"
+                  align="center">
                     <img src="/@@/no" title="Unknown" />
                     <a tal:condition="item/product/required:launchpad.Edit"
                        tal:attributes="href item/product_edit_url">
@@ -225,11 +227,11 @@
                  tal:content="item/upstream_bugs_delta"></a>
             </td>
             <tal:upstream-in-launchpad
-                condition="item/official_malone">
+                condition="item/bug_tracking_usage/enumvalue:LAUNCHPAD">
                 <td colspan="4" class="good">&nbsp;</td>
             </tal:upstream-in-launchpad>
             <tal:upstream-not-in-launchpad
-                condition="not: item/official_malone">
+                condition="not: item/bug_tracking_usage/enumvalue:LAUNCHPAD">
               <td tal:attributes="class string:amount ${item/watched_bugs_class}"
                   tal:content="item/watched_bugs" />
               <td tal:attributes="class string:amount ${item/watched_bugs_class}"

=== modified file 'lib/lp/bugs/tests/bugtarget-questiontarget.txt'
--- lib/lp/bugs/tests/bugtarget-questiontarget.txt	2009-06-12 16:36:02 +0000
+++ lib/lp/bugs/tests/bugtarget-questiontarget.txt	2010-09-02 19:34:49 +0000
@@ -43,8 +43,8 @@
 prerequisite for a bug to become a question is that the bugtarget's
 pillar must use Launchpad to track bugs.
 
-    >>> bug.affected_pillars[0].official_malone
-    True
+    >>> bug.affected_pillars[0].bug_tracking_usage
+    <DBItem ServiceUsage.LAUNCHPAD, (20) Launchpad>   
     >>> bug.canBeAQuestion()
     True
 
@@ -56,8 +56,8 @@
     >>> firefox = firefox_bug.bugtasks[0].target
     >>> IQuestionTarget.providedBy(firefox)
     True
-    >>> firefox.distribution.official_malone
-    False
+    >>> firefox.distribution.bug_tracking_usage
+    <DBItem ServiceUsage.UNKNOWN, (10) Unknown>
     >>> firefox_bug.canBeAQuestion()
     False
 

=== modified file 'lib/lp/bugs/tests/test_bugs_webservice.py'
--- lib/lp/bugs/tests/test_bugs_webservice.py	2010-08-30 05:19:46 +0000
+++ lib/lp/bugs/tests/test_bugs_webservice.py	2010-09-02 19:34:49 +0000
@@ -10,6 +10,7 @@
 from BeautifulSoup import BeautifulSoup
 from lazr.lifecycle.interfaces import IDoNotSnapshot
 from simplejson import dumps
+from storm.store import Store
 from testtools.matchers import (
     Equals,
     LessThan,
@@ -147,33 +148,40 @@
     layer = LaunchpadFunctionalLayer
 
     def test_attachments_query_counts_constant(self):
+        # XXX j.c.sackett 2010-09-02 bug=619017
+        # This test was being thrown off by the reference bug. To get around
+        # the problem, flush and reset are called on the bug storm cache
+        # before each call to the webservice. When lp's storm is updated
+        # to release the committed fix for this bug, please see about
+        # updating this test.
         login(USER_EMAIL)
         self.bug = self.factory.makeBug()
-        self.factory.makeBugAttachment(self.bug)
-        self.factory.makeBugAttachment(self.bug)
+        store = Store.of(self.bug)
+        self.factory.makeBugAttachment(self.bug)
+        self.factory.makeBugAttachment(self.bug)
+        person = self.factory.makePerson()
         webservice = LaunchpadWebServiceCaller(
             'launchpad-library', 'salgado-change-anything')
         collector = QueryCollector()
         collector.register()
         self.addCleanup(collector.unregister)
         url = '/bugs/%d/attachments' % self.bug.id
+        #First request
+        store.flush()
+        store.reset()
         response = webservice.get(url)
         self.assertThat(collector, HasQueryCount(LessThan(24)))
         with_2_count = collector.count
         self.failUnlessEqual(response.status, 200)
         login(USER_EMAIL)
-        self.factory.makeBugAttachment(self.bug)
+        for i in range(5):
+            self.factory.makeBugAttachment(self.bug)
         logout()
+        #Second request
+        store.flush()
+        store.reset()
         response = webservice.get(url)
-        # XXX: Permit the second call to be == or less, because storm
-        # caching bugs (such as) https://bugs.launchpad.net/storm/+bug/619017
-        # which can cause spurious queries. There was an EC2 failure landing
-        # with this set to strictly equal which I could not reproduce locally,
-        # and the ec2 test did not report the storm egg used, so could not 
-        # confidently rule out some form of skew.
-        self.assertThat(collector, HasQueryCount(MatchesAny(
-            Equals(with_2_count),
-            LessThan(with_2_count))))
+        self.assertThat(collector, HasQueryCount(Equals(with_2_count+1)))
 
 
 class TestBugMessages(TestCaseWithFactory):

=== modified file 'lib/lp/bugs/tests/test_bugtask_1.py'
--- lib/lp/bugs/tests/test_bugtask_1.py	2010-08-20 20:31:18 +0000
+++ lib/lp/bugs/tests/test_bugtask_1.py	2010-09-02 19:34:49 +0000
@@ -17,6 +17,7 @@
     )
 from canonical.launchpad.webapp.interfaces import ILaunchBag
 from canonical.testing import DatabaseFunctionalLayer
+from lp.app.enums import ServiceUsage
 from lp.bugs.interfaces.bug import IBugSet
 from lp.bugs.interfaces.bugtask import (
     BugTaskStatus,
@@ -73,7 +74,9 @@
         # Mark an upstream task on bug #1 "Fix Released"
         bug_one = bugset.get(1)
         firefox_upstream = self._getBugTaskByTarget(bug_one, firefox)
-        self.assert_(firefox_upstream.product.official_malone)
+        self.assertEqual(
+            ServiceUsage.LAUNCHPAD,
+            firefox_upstream.product.bug_tracking_usage)
         self.old_firefox_status = firefox_upstream.status
         firefox_upstream.transitionToStatus(
             BugTaskStatus.FIXRELEASED, getUtility(ILaunchBag).user)
@@ -127,12 +130,10 @@
         """
         non_malone_using_bugtasks = [
             related_task for related_task in bugtask.related_tasks
-            if not related_task.target_uses_malone
-            ]
+            if not related_task.target_uses_malone]
         pending_bugwatch_bugtasks = [
             related_bugtask for related_bugtask in non_malone_using_bugtasks
-            if related_bugtask.bugwatch is None
-            ]
+            if related_bugtask.bugwatch is None]
         self.assert_(
             len(pending_bugwatch_bugtasks) > 0,
             'Bugtask %s on %s has no related bug watches elsewhere.' % (
@@ -166,8 +167,7 @@
         resolved_related_tasks = [
             related_task for related_task in bugtask.related_tasks
             if (_is_resolved_upstream_task(related_task) or
-                _is_resolved_bugwatch_task(related_task))
-            ]
+                _is_resolved_bugwatch_task(related_task))]
 
         self.assert_(len(resolved_related_tasks) > 0)
         self.assert_(
@@ -203,8 +203,7 @@
         open_related_tasks = [
             related_task for related_task in bugtask.related_tasks
             if (_is_open_upstream_task(related_task) or
-                _is_open_bugwatch_task(related_task))
-            ]
+                _is_open_bugwatch_task(related_task))]
 
         self.assert_(
             len(open_related_tasks) > 0,

=== modified file 'lib/lp/registry/browser/sourcepackage.py'
--- lib/lp/registry/browser/sourcepackage.py	2010-08-23 22:29:52 +0000
+++ lib/lp/registry/browser/sourcepackage.py	2010-09-02 19:34:49 +0000
@@ -73,6 +73,7 @@
 from canonical.launchpad.webapp.publisher import LaunchpadView
 from canonical.lazr.utils import smartquote
 from canonical.widgets import LaunchpadRadioWidget
+from lp.app.enums import ServiceUsage
 from lp.answers.browser.questiontarget import (
     QuestionTargetAnswersMenu,
     QuestionTargetFacetMixin,
@@ -283,8 +284,7 @@
         self.product = getUtility(IProductSet)[product_name]
         series_list = [
             series for series in self.product.series
-            if series.status != SeriesStatus.OBSOLETE
-            ]
+            if series.status != SeriesStatus.OBSOLETE]
 
         # If the product is not being changed, then the current
         # productseries can be the default choice. Otherwise,
@@ -306,8 +306,7 @@
             series_list.remove(dev_focus)
         vocab_terms = [
             SimpleTerm(series, series.name, series.name)
-            for series in series_list
-            ]
+            for series in series_list]
         dev_focus_term = SimpleTerm(
             dev_focus, dev_focus.name, "%s (Recommended)" % dev_focus.name)
         vocab_terms.insert(0, dev_focus_term)
@@ -339,6 +338,7 @@
     next_url = None
 
     main_action_label = u'Change'
+    
     def main_action(self, data):
         productseries = data['productseries']
         # Because it is part of a multistep view, the next_url can't
@@ -575,7 +575,7 @@
         if self.context.productseries is None:
             return False
         product = self.context.productseries.product
-        if product.official_malone:
+        if product.bug_tracking_usage == ServiceUsage.LAUNCHPAD:
             return True
         bugtracker = product.bugtracker
         if bugtracker is None:

=== modified file 'lib/lp/registry/browser/tests/distribution-views.txt'
--- lib/lp/registry/browser/tests/distribution-views.txt	2010-06-16 08:22:00 +0000
+++ lib/lp/registry/browser/tests/distribution-views.txt	2010-09-02 19:34:49 +0000
@@ -106,8 +106,8 @@
 
 The view accepts most of the distribution fields.
 
-    >>> distribution.official_malone
-    False
+    >>> distribution.bug_tracking_usage
+    <DBItem ServiceUsage.UNKNOWN, (10) Unknown>
 
     >>> view.field_names
     ['displayname', 'title', 'summary', 'description',
@@ -130,8 +130,8 @@
     >>> print distribution.bug_reporting_guidelines
     guidelines
 
-    >>> distribution.official_malone
-    True
+    >>> distribution.bug_tracking_usage
+    <DBItem ServiceUsage.LAUNCHPAD, (20) Launchpad>
 
 Only admins and owners can access the view.
 

=== modified file 'lib/lp/registry/browser/tests/sourcepackage-views.txt'
--- lib/lp/registry/browser/tests/sourcepackage-views.txt	2010-08-04 05:27:22 +0000
+++ lib/lp/registry/browser/tests/sourcepackage-views.txt	2010-09-02 19:34:49 +0000
@@ -293,8 +293,8 @@
     >>> view = create_initialized_view(
     ...     package, name='+upstream-connections')
 
-    >>> print product.official_malone
-    False
+    >>> print product.bug_tracking_usage.name
+    UNKNOWN
     >>> print product.bugtracker
     None
     >>> print view.has_bugtracker

=== modified file 'lib/lp/registry/doc/product.txt'
--- lib/lp/registry/doc/product.txt	2010-08-22 19:46:19 +0000
+++ lib/lp/registry/doc/product.txt	2010-09-02 19:34:49 +0000
@@ -258,8 +258,8 @@
 one.
 
     >>> firefox = getUtility(IProductSet).getByName('firefox')
-    >>> firefox.official_malone
-    True
+    >>> firefox.bug_tracking_usage
+    <DBItem ServiceUsage.LAUNCHPAD, (20) Launchpad>
     >>> print firefox.bug_tracking_usage.name
     LAUNCHPAD
     >>> firefox.getExternalBugTracker() is None

=== modified file 'lib/lp/registry/templates/distribution-index.pt'
--- lib/lp/registry/templates/distribution-index.pt	2010-08-06 16:01:38 +0000
+++ lib/lp/registry/templates/distribution-index.pt	2010-09-02 19:34:49 +0000
@@ -55,7 +55,7 @@
             tal:condition="context/official_answers" />
 
           <div tal:replace="structure context/@@+portlet-latestbugs"
-            tal:condition="context/official_malone" />
+            tal:condition="context/bug_tracking_usage/enumvalue:LAUNCHPAD" />
 
           <div tal:replace="structure context/@@+portlet-top-contributors" />
         </div>

=== modified file 'lib/lp/registry/templates/distribution-search.pt'
--- lib/lp/registry/templates/distribution-search.pt	2009-08-05 19:34:07 +0000
+++ lib/lp/registry/templates/distribution-search.pt	2010-09-02 19:34:49 +0000
@@ -69,7 +69,7 @@
                     tal:define="distribution package/distribution">
                     <a
                       tal:define="link package/menu:bugs/filebug"
-                      tal:condition="distribution/official_malone"
+                      tal:condition="distribution/bug_tracking_usage/enumvalue:LAUNCHPAD"
                       tal:attributes="href link/url">
                       <img
                         tal:attributes="alt link/text"

=== modified file 'lib/lp/registry/templates/product-index.pt'
--- lib/lp/registry/templates/product-index.pt	2010-08-25 19:15:48 +0000
+++ lib/lp/registry/templates/product-index.pt	2010-09-02 19:34:49 +0000
@@ -218,7 +218,7 @@
             tal:condition="context/official_answers" />
 
           <div tal:content="structure context/@@+portlet-latestbugs"
-            tal:condition="context/official_malone" />
+            tal:condition="context/bug_tracking_usage/enumvalue:LAUNCHPAD" />
 
           <div tal:content="structure context/@@+portlet-top-contributors" />
 

=== modified file 'lib/lp/testing/factory.py'
--- lib/lp/testing/factory.py	2010-08-30 06:38:53 +0000
+++ lib/lp/testing/factory.py	2010-09-02 19:34:49 +0000
@@ -836,7 +836,7 @@
             project=project,
             registrant=registrant)
         if official_malone is not None:
-            product.official_malone = official_malone
+            removeSecurityProxy(product).official_malone = official_malone
         if official_rosetta is not None:
             removeSecurityProxy(product).official_rosetta = official_rosetta
         if bug_supervisor is not None: