launchpad-reviewers team mailing list archive

[Steve Kowalik <stevenk@xxxxxxxxxx>]

Steve Kowalik has proposed merging lp:~stevenk/launchpad/clean-up-ibranch into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~stevenk/launchpad/clean-up-ibranch/+merge/121536

I noticed this a few days ago, but only got around to fixing it now. Firstly, Branch.transitively_private now only exists in the model, so it can finally be killed. IBranch.explicitly_private was listed twice in the interface, one exported and one not, so I killed the one that wasn't exported. I have also made explicitly_private = private in the model to save on duplicated code.
-- 
https://code.launchpad.net/~stevenk/launchpad/clean-up-ibranch/+merge/121536
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~stevenk/launchpad/clean-up-ibranch into lp:launchpad.

=== modified file 'lib/lp/code/interfaces/branch.py'
--- lib/lp/code/interfaces/branch.py	2012-08-21 11:03:33 +0000
+++ lib/lp/code/interfaces/branch.py	2012-08-28 05:29:26 +0000
@@ -249,10 +249,6 @@
             title=_('Date Last Modified'),
             required=True,
             readonly=False))
-    explicitly_private = Bool(
-        title=_("Explicitly Private"),
-        description=_("This branch is explicitly marked private as opposed "
-        "to being private because it is stacked on a private branch."))
     information_type = exported(
         Choice(
             title=_('Information Type'), vocabulary=InformationType,

=== modified file 'lib/lp/code/model/branch.py'
--- lib/lp/code/model/branch.py	2012-08-07 02:31:56 +0000
+++ lib/lp/code/model/branch.py	2012-08-28 05:29:26 +0000
@@ -203,19 +203,12 @@
         enum=InformationType, default=InformationType.PUBLIC)
     access_policy = IntCol()
 
-    # These can die after the UI is dropped.
-    @property
-    def explicitly_private(self):
-        return self.private
-
-    @property
-    def transitively_private(self):
-        return self.private
-
     @property
     def private(self):
         return self.information_type in PRIVATE_INFORMATION_TYPES
 
+    explicitly_private = private
+
     def _reconcileAccess(self):
         """Reconcile the branch's sharing information.