← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~stevenk/launchpad/death-to-branch-listing-now into lp:launchpad

 

Steve Kowalik has proposed merging lp:~stevenk/launchpad/death-to-branch-listing-now into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~stevenk/launchpad/death-to-branch-listing-now/+merge/66621
-- 
https://code.launchpad.net/~stevenk/launchpad/death-to-branch-listing-now/+merge/66621
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~stevenk/launchpad/death-to-branch-listing-now into lp:launchpad.
=== modified file 'lib/lp/code/browser/branchlisting.py'
--- lib/lp/code/browser/branchlisting.py	2011-06-30 15:36:20 +0000
+++ lib/lp/code/browser/branchlisting.py	2011-07-01 15:01:58 +0000
@@ -191,7 +191,7 @@
     """
     delegates(IBranch, 'context')
 
-    def __init__(self, branch, last_commit, now, show_bug_badge,
+    def __init__(self, branch, last_commit, show_bug_badge,
                  show_blueprint_badge, show_mp_badge,
                  associated_product_series, suite_source_packages):
         BranchBadges.__init__(self, branch)
@@ -199,7 +199,6 @@
         self.show_bug_badge = show_bug_badge
         self.show_blueprint_badge = show_blueprint_badge
         self.show_merge_proposals = show_mp_badge
-        self._now = now
         self.associated_product_series = associated_product_series
         self.suite_source_packages = suite_source_packages
 
@@ -343,7 +342,6 @@
     #   visible_branches_for_view
     def __init__(self, user):
         self._distro_series_map = {}
-        self._now = datetime.now(pytz.UTC)
         self.view_user = user
 
     def getBranchCollection(self):
@@ -484,9 +482,8 @@
         associated_product_series = self.getProductSeries(branch)
         suite_source_packages = self.getSuiteSourcePackages(branch)
         return BranchListingItem(
-            branch, last_commit, self._now, show_bug_badge,
-            show_blueprint_badge, show_mp_badge,
-            associated_product_series, suite_source_packages)
+            branch, last_commit, show_bug_badge, show_blueprint_badge,
+            show_mp_badge, associated_product_series, suite_source_packages)
 
     def decoratedBranches(self, branches):
         """Return the decorated branches for the branches passed in."""