launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging lp:~cjwatson/launchpad/product-projectgroup into lp:launchpad.

Commit message:
Fix test failures due to renaming of Product.project to Product.projectgroup.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #523054 in Launchpad itself: "Rename Product.project to Product.projectgroup"
  https://bugs.launchpad.net/launchpad/+bug/523054

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/product-projectgroup/+merge/248035

Fix test failures due to renaming of Product.project to Product.projectgroup.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/launchpad/product-projectgroup into lp:launchpad.

=== modified file 'lib/lp/bugs/mail/tests/test_commands.py'
--- lib/lp/bugs/mail/tests/test_commands.py	2012-09-17 16:13:40 +0000
+++ lib/lp/bugs/mail/tests/test_commands.py	2015-01-29 18:51:54 +0000
@@ -74,9 +74,9 @@
         login_person(owner)
         project_group = self.factory.makeProject(name='fnord', owner=owner)
         project_1 = self.factory.makeProduct(name='pting', owner=owner)
-        project_1.project = project_group
+        project_1.projectgroup = project_group
         project_2 = self.factory.makeProduct(name='snarf', owner=owner)
-        project_2.project = project_group
+        project_2.projectgroup = project_group
         message = (
             "fnord is a group of projects. To report a bug, you need to "
             "specify which of these projects the bug applies to: "

=== modified file 'lib/lp/registry/doc/karmacontext.txt'
--- lib/lp/registry/doc/karmacontext.txt	2012-12-26 01:32:19 +0000
+++ lib/lp/registry/doc/karmacontext.txt	2015-01-29 18:51:54 +0000
@@ -3,9 +3,9 @@
 
 Now that we track the Product/Distribution in which a given karma-giving
 action was performed, we're able to find out who contributes the most to a
-given product/project/distribution.  We can have this on a per-category
-(Bug Management, Translations, etc) basis or in general, across all
-categories.
+given product/project group/distribution.  We can have this on a
+per-category (Bug Management, Translations, etc) basis or in general, across
+all categories.
 
     >>> import operator
     >>> from zope.component import getUtility
@@ -22,7 +22,7 @@
     True
     >>> verifyObject(IKarmaContext, ubuntu)
     True
-    >>> verifyObject(IKarmaContext, firefox.project)
+    >>> verifyObject(IKarmaContext, firefox.projectgroup)
     True
 
     >>> [(person.name, karmavalue)
@@ -41,7 +41,7 @@
     [(u'mark', 27)]
 
 We also have a way of retrieving the top contributors of a given
-product/project/distribution grouped by categories.
+product/project group/distribution grouped by categories.
 
     >>> contributors = ubuntu.getTopContributorsGroupedByCategory(limit=2)
     >>> sorted_categories = sorted(contributors.keys(),
@@ -53,15 +53,16 @@
     Bug Management: [(u'name16', 26), (u'name12', 13)]
     Specification Tracking: [(u'mark', 37)]
 
-The top contributors of a project are the ones with the most karma in all
-products of that project.
+The top contributors of a project group are the ones with the most karma in
+all products of that project group.
 
-Note that Foo Bar's karma on the mozilla project is the sum of Foo Bar's
-karma on the firefox and thunderbird products, which are both part of
-the mozilla project.
+Note that Foo Bar's karma on the mozilla project group is the sum of Foo
+Bar's karma on the firefox and thunderbird products, which are both part of
+the mozilla project group.
 
     >>> [(person.name, karmavalue)
-    ...  for person, karmavalue in firefox.project.getTopContributors(limit=3)]
+    ...  for person, karmavalue
+    ...  in firefox.projectgroup.getTopContributors(limit=3)]
     [(u'name12', 66), (u'mark', 27), (u'name16', 23)]
 
     >>> [(person.name, karmavalue)
@@ -69,7 +70,7 @@
     [(u'name12', 66), (u'mark', 27), (u'name16', 8)]
 
     >>> thunderbird = getUtility(IProductSet).getByName('thunderbird')
-    >>> thunderbird.project == firefox.project
+    >>> thunderbird.projectgroup == firefox.projectgroup
     True
     >>> [(person.name, karmavalue)
     ...  for person, karmavalue in thunderbird.getTopContributors(limit=3)]

=== modified file 'lib/lp/registry/doc/launchpad-container.txt'
--- lib/lp/registry/doc/launchpad-container.txt	2012-12-26 01:32:19 +0000
+++ lib/lp/registry/doc/launchpad-container.txt	2015-01-29 18:51:54 +0000
@@ -13,14 +13,14 @@
     >>> from lp.registry.interfaces.distribution import (
     ...     IDistributionSet)
     >>> firefox = getUtility(IProductSet)['firefox']
-    >>> mozilla = firefox.project
+    >>> mozilla = firefox.projectgroup
     >>> ubuntu = getUtility(IDistributionSet)['ubuntu']
     >>> evolution = ubuntu.getSourcePackage('evolution')
 
 The ILaunchpadContainer defines only the isWithin(context) method, which
 returns True if this context is the given one or is within it.
 
-A product is within itself or its project.
+A product is within itself or its project group.
 
     >>> ILaunchpadContainer(firefox).isWithin(firefox)
     True
@@ -31,7 +31,7 @@
     >>> verifyObject(ILaunchpadContainer, ILaunchpadContainer(firefox))
     True
 
-A project is only within itself.
+A project group is only within itself.
 
     >>> ILaunchpadContainer(mozilla).isWithin(mozilla)
     True

=== modified file 'lib/lp/registry/doc/product-widgets.txt'
--- lib/lp/registry/doc/product-widgets.txt	2012-12-16 23:23:52 +0000
+++ lib/lp/registry/doc/product-widgets.txt	2015-01-29 18:51:54 +0000
@@ -39,7 +39,7 @@
 
 Firefox has not yet selected a bug tracker.
 
-    >>> print firefox.project.bugtracker
+    >>> print firefox.projectgroup.bugtracker
     None
 
     >>> from BeautifulSoup import BeautifulSoup, Tag
@@ -69,7 +69,7 @@
 
     >>> gnome_bugzilla = tracker_set.getByName('gnome-bugzilla')
     >>> login('foo.bar@xxxxxxxxxxxxx')
-    >>> firefox.project.bugtracker = gnome_bugzilla
+    >>> firefox.projectgroup.bugtracker = gnome_bugzilla
 
     >>> print_items(widget())
     [ ] In Launchpad
@@ -79,8 +79,8 @@
 
 On second thought, Firefox has no specified bug tracker.
 
-    >>> old_firefox_project = firefox.project
-    >>> firefox.project = None
+    >>> old_firefox_projectgroup = firefox.projectgroup
+    >>> firefox.projectgroup = None
 
     >>> print_items(widget())
     [ ] In Launchpad

=== modified file 'lib/lp/registry/doc/product.txt'
--- lib/lp/registry/doc/product.txt	2013-05-01 21:23:16 +0000
+++ lib/lp/registry/doc/product.txt	2015-01-29 18:51:54 +0000
@@ -222,7 +222,7 @@
 
 If a product doesn't use Malone, it can specify that it uses an
 external bug tracker. It can either use its own bug tracker, or use its
-project's bug tracker. In order to make this logic easier for call
+project group's bug tracker. In order to make this logic easier for call
 sites, there is a method that takes care of it called
 getExternalBugTracker.
 
@@ -238,18 +238,18 @@
     >>> firefox.getExternalBugTracker() is None
     True
 
-This is true even if its project has a bug tracker specified.
+This is true even if its project group has a bug tracker specified.
 
     >>> from lp.bugs.interfaces.bugtracker import IBugTrackerSet
 
     >>> ignored = login_person(firefox.owner)
     >>> bug_tracker_set = getUtility(IBugTrackerSet)
     >>> gnome_bugzilla = bug_tracker_set.getByName('gnome-bugzilla')
-    >>> firefox.project.bugtracker = gnome_bugzilla
+    >>> firefox.projectgroup.bugtracker = gnome_bugzilla
     >>> firefox.getExternalBugTracker() is None
     True
 
-Now, if we say that Firefox doesn't use Malone, its project's bug
+Now, if we say that Firefox doesn't use Malone, its project group's bug
 tracker will be returned.
 
     >>> firefox.official_malone = False
@@ -261,7 +261,7 @@
     u'gnome-bugzilla'
 
 
-If Firefox isn't happy with its project's bug tracker it can choose to
+If Firefox isn't happy with its project group's bug tracker it can choose to
 specify its own.
 
     >>> debbugs = getUtility(IBugTrackerSet).getByName('debbugs')
@@ -272,10 +272,10 @@
     EXTERNAL
 
 
-If neither the project nor the product have specified a bug tracker,
+If neither the project group nor the product have specified a bug tracker,
 None will of course be returned.
 
-    >>> firefox.project.bugtracker = None
+    >>> firefox.projectgroup.bugtracker = None
     >>> firefox.bugtracker = None
     >>> firefox.getExternalBugTracker() is None
     True
@@ -392,7 +392,7 @@
     >>> [milestone.name for milestone in firefox.milestones]
     [u'1.0']
 
-Milestones for products can only be created by product/project owners,
+Milestones for products can only be created by product/project group owners,
 registry experts, or admins.
 
     >>> from datetime import datetime

=== modified file 'lib/lp/registry/templates/milestone-index.pt'
--- lib/lp/registry/templates/milestone-index.pt	2012-10-04 20:38:22 +0000
+++ lib/lp/registry/templates/milestone-index.pt	2015-01-29 18:51:54 +0000
@@ -317,11 +317,11 @@
               milestones for
               <tal:project replace="view/milestone/target/displayname" /></a>
           </li>
-          <li tal:condition="view/milestone/target/project|nothing">
+          <li tal:condition="view/milestone/target/projectgroup|nothing">
             <a class="sprite info"
-              tal:attributes="href view/milestone/target/project/menu:overview/milestones/fmt:url">View
+              tal:attributes="href view/milestone/target/projectgroup/menu:overview/milestones/fmt:url">View
               milestones for
-              <tal:project replace="view/milestone/target/project/displayname" /></a>
+              <tal:project replace="view/milestone/target/projectgroup/displayname" /></a>
           </li>
           <li tal:condition="view/milestone/series_target|nothing">
             <a class="sprite info"

=== modified file 'lib/lp/registry/templates/sourcepackage-upstream-connections.pt'
--- lib/lp/registry/templates/sourcepackage-upstream-connections.pt	2010-11-18 20:50:00 +0000
+++ lib/lp/registry/templates/sourcepackage-upstream-connections.pt	2015-01-29 18:51:54 +0000
@@ -11,8 +11,8 @@
 <div id="upstreams" tal:define="series context/productseries">
   <dl>
     <dd>
-      <tal:has_pg condition="series/product/project">
-        <a tal:replace="structure series/product/project/fmt:link" /> &rArr;
+      <tal:has_pg condition="series/product/projectgroup">
+        <a tal:replace="structure series/product/projectgroup/fmt:link" /> &rArr;
       </tal:has_pg>
       <a tal:replace="structure series/product/fmt:link" /> &rArr;
       <a tal:content="series/name"

=== modified file 'lib/lp/translations/browser/tests/test_noindex.py'
--- lib/lp/translations/browser/tests/test_noindex.py	2012-10-09 10:28:02 +0000
+++ lib/lp/translations/browser/tests/test_noindex.py	2015-01-29 18:51:54 +0000
@@ -106,7 +106,7 @@
         self.factory.makePOTemplate(
             productseries=self.product.development_focus)
         self.naked_translatable = removeSecurityProxy(self.product)
-        self.naked_translatable.project = self.target
+        self.naked_translatable.projectgroup = self.target
 
 
 class TestRobotsProductSeries(BrowserTestCase, TestRobotsMixin):

=== modified file 'lib/lp/translations/stories/standalone/xx-translation-access-display.txt'
--- lib/lp/translations/stories/standalone/xx-translation-access-display.txt	2011-12-30 06:14:56 +0000
+++ lib/lp/translations/stories/standalone/xx-translation-access-display.txt	2015-01-29 18:51:54 +0000
@@ -33,7 +33,7 @@
 
 == Displaying translation groups and reviewers ==
 
-Evolution is part of the Gnome project, and when Gnome sets a
+Evolution is part of the Gnome project group, and when Gnome sets a
 translation group of its own, that too is shown here.
 
     >>> import re
@@ -51,7 +51,7 @@
     >>> gnomegroup = TranslationGroup(name='gnomegroup',
     ...     title="Gnome translation group", summary="Testing group",
     ...     datecreated=UTC_NOW, owner=foobar)
-    >>> evolution.project.translationgroup = gnomegroup
+    >>> evolution.projectgroup.translationgroup = gnomegroup
 
     >>> admin_browser.open(
     ...     'http://translations.launchpad.dev/'
@@ -62,7 +62,7 @@
 
 If the two groups are identical, however, it is only listed once.
 
-    >>> evolution.project.translationgroup = evolution.translationgroup
+    >>> evolution.projectgroup.translationgroup = evolution.translationgroup
 
     >>> admin_browser.open(
     ...     'http://translations.launchpad.dev/'
@@ -76,7 +76,7 @@
 
     >>> original_translation_group = evolution.translationgroup
     >>> evolution.translationgroup = None
-    >>> evolution.project.translationgroup = None
+    >>> evolution.projectgroup.translationgroup = None
 
     >>> admin_browser.open(
     ...     'http://translations.launchpad.dev/'

=== modified file 'lib/lp/translations/templates/pofile-portlet-details.pt'
--- lib/lp/translations/templates/pofile-portlet-details.pt	2012-07-06 06:02:33 +0000
+++ lib/lp/translations/templates/pofile-portlet-details.pt	2015-01-29 18:51:54 +0000
@@ -34,8 +34,8 @@
            tal:attributes="href product/translationgroup/fmt:url"
              >Ubuntu Translation Group</a><br />
       </tal:has_prod_translationgrp>
-      <tal:has_project_group condition="product/project"
-                       define="projectgroup product/project">
+      <tal:has_project_group condition="product/projectgroup"
+                       define="projectgroup product/projectgroup">
         <b>Project group:</b>
           <a tal:content="projectgroup/displayname"
              tal:attributes="href string:/${projectgroup/name}/" /><br />