launchpad-reviewers team mailing list archive

[William Grant <me@xxxxxxxxxxxxxxxxxx>]

William Grant has proposed merging lp:~wgrant/launchpad/no-more-userdata into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~wgrant/launchpad/no-more-userdata/+merge/116215

User Data has been entirely renamed to Private, so the last couple of sites that override it to Private behind a feature flag can be cleaned up.
-- 
https://code.launchpad.net/~wgrant/launchpad/no-more-userdata/+merge/116215
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~wgrant/launchpad/no-more-userdata into lp:launchpad.

=== modified file 'lib/lp/app/browser/tales.py'
--- lib/lp/app/browser/tales.py	2012-07-16 21:57:51 +0000
+++ lib/lp/app/browser/tales.py	2012-07-23 07:55:24 +0000
@@ -64,10 +64,7 @@
 from lp.buildmaster.enums import BuildStatus
 from lp.code.interfaces.branch import IBranch
 from lp.layers import LaunchpadLayer
-from lp.registry.enums import (
-    InformationType,
-    PRIVATE_INFORMATION_TYPES,
-    )
+from lp.registry.enums import PRIVATE_INFORMATION_TYPES
 from lp.registry.interfaces.distribution import IDistribution
 from lp.registry.interfaces.distributionsourcepackage import (
     IDistributionSourcePackage,
@@ -75,7 +72,6 @@
 from lp.registry.interfaces.person import IPerson
 from lp.registry.interfaces.product import IProduct
 from lp.registry.interfaces.projectgroup import IProjectGroup
-from lp.services.features import getFeatureFlag
 from lp.services.utils import total_seconds
 from lp.services.webapp import (
     canonical_url,
@@ -962,17 +958,10 @@
     def badges(self):
         badges = []
         information_type = self._context.bug.information_type
-        flag = bool(
-            getFeatureFlag('disclosure.display_userdata_as_private.enabled'))
         if information_type in PRIVATE_INFORMATION_TYPES:
-            if flag and information_type == InformationType.USERDATA:
-                badges.append(self.icon_template % (
-                    "private", "Private", "sprite private"))
-            else:
-                badges.append(self.icon_template % (
-                   information_type.title,
-                   information_type.description,
-                   "sprite private"))
+            badges.append(self.icon_template % (
+                information_type.title, information_type.description,
+                "sprite private"))
 
         if self._hasBugBranch():
             badges.append(self.icon_template % (

=== modified file 'lib/lp/app/widgets/itemswidgets.py'
--- lib/lp/app/widgets/itemswidgets.py	2012-05-01 05:08:24 +0000
+++ lib/lp/app/widgets/itemswidgets.py	2012-07-23 07:55:24 +0000
@@ -159,10 +159,7 @@
         """Render the table row for the widget depending on description."""
         if form_value != self._missing:
             vocab_term = self.vocabulary.getTermByToken(form_value)
-            # This is not needed when display_userdata_as_private is removed.
-            description = getattr(vocab_term, 'description', None)
-            if description is None:
-                description = vocab_term.value.description
+            description = vocab_term.value.description
         else:
             description = None