Merge lp:~sinzui/launchpad/peppermint-sticks into lp:launchpad

[Curtis Hovey]

Fix ProjectGroup.products sort order and remove Author: comments.

    Launchpad bug:
        https://bugs.launchpad.net/bugs/385711
        https://bugs.launchpad.net/bugs/398896
    Pre-implementation: no one
    Test command: ./bin/test -vv \
      -t doc/projectgroup -t doc/milestone \
      -t xx-project-index -t xx-project-guided-filebug

Bug #385711 [projectgroup sorts projects by their name instead of displayname]
    The project drop-down menu in the form for filing a new bug on a
    projectgroup shows the project displayname, but it sorts the list by the
    project name. The project group page is also sorted wrong

Bug #398896 [get rid of Author tags (etc) in Launchpad source code]
    Some files in the Launchpad source code have "Author:" tags. They
    shouldn't.

--------------------------------------------------------------------

RULES

Bug #385711 [projectgroup sorts projects by their name instead of displayname]
    * Change ProjectGroup.products to sort by displayname.
    * ADDENDUM Remove ProductView.projproducts because it is never used.

Bug #398896 [get rid of Author tags (etc) in Launchpad source code]
    * Delete the lines

QA

Bug #385711 [projectgroup sorts projects by their name instead of displayname]
    * Visit https://launchpad.net/launchpad-project
    * Verify the projects are listed in alphabetical order.

Bug #398896 [get rid of Author tags (etc) in Launchpad source code]
    None

LINT

  cronscripts/buildd-queue-builder.py
  daemons/buildd-slave.tac
  doc/security.txt
  lib/canonical/buildd/__init__.py
  lib/canonical/buildd/generate-translation-templates
  lib/canonical/buildd/mount-chroot
  lib/canonical/buildd/override-sources-list
  lib/canonical/buildd/remove-build
  lib/canonical/buildd/scan-for-processes
  lib/canonical/buildd/umount-chroot
  lib/canonical/buildd/unpack-chroot
  lib/canonical/buildd/update-debian-chroot
  lib/canonical/buildd/debian/launchpad-buildd.init
  lib/canonical/launchpad/scripts/tests/__init__.py
  lib/lp/bugs/stories/guided-filebug/xx-project-guided-filebug.txt
  lib/lp/registry/browser/product.py
  lib/lp/registry/codesofconduct/README
  lib/lp/registry/doc/milestone.txt
  lib/lp/registry/doc/projectgroup.txt
  lib/lp/registry/model/projectgroup.py
  lib/lp/registry/stories/project/xx-project-index.txt

^ Lint hates the txt files. I can clean these up before I land.

IMPLEMENTATION

Bug #385711 [projectgroup sorts projects by their name instead of displayname]
    Changed the sort on ProjectGroup.products to displayname. Removed unused
    method from ProductView.projproducts and duplicate test from
    xx-project-guided-filebug.
    lib/lp/bugs/stories/guided-filebug/xx-project-guided-filebug.txt
    lib/lp/registry/browser/product.py
    lib/lp/registry/doc/milestone.txt
    lib/lp/registry/doc/projectgroup.txt
    lib/lp/registry/model/projectgroup.py
    lib/lp/registry/stories/project/xx-project-index.txt

Bug #398896 [get rid of Author tags (etc) in Launchpad source code]
    Deleted the author comments from the files.
    cronscripts/buildd-queue-builder.py
    daemons/buildd-slave.tac
    doc/security.txt
    lib/canonical/buildd/__init__.py
    lib/canonical/buildd/debian/launchpad-buildd.init
    lib/canonical/buildd/generate-translation-templates
    lib/canonical/buildd/mount-chroot
    lib/canonical/buildd/override-sources-list
    lib/canonical/buildd/remove-build
    lib/canonical/buildd/scan-for-processes
    lib/canonical/buildd/umount-chroot
    lib/canonical/buildd/unpack-chroot
    lib/canonical/buildd/update-debian-chroot
    lib/canonical/launchpad/scripts/tests/__init__.py
    lib/lp/registry/codesofconduct/README

[Leonard Richardson (leonardr)]

Starting on line 301, you should mention the "display names" instead of the "names". You should also show the display names--otherwise there's no way to verify that the projects are really in alphabetical order.

Everything else looks good.

review: Approve

=== modified file 'cronscripts/buildd-queue-builder.py'
--- cronscripts/buildd-queue-builder.py	2010-04-27 19:48:39 +0000
+++ cronscripts/buildd-queue-builder.py	2010-12-24 16:44:20 +0000
@@ -2,13 +2,8 @@
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
+"""Build Jobs initialisation."""
 
-# pylint: disable-msg=C0103,W0403
-# Author: Daniel Silverstone <[e-mail]>
-#         Celso Providelo <[e-mail]>
-#
-# Build Jobs initialisation
-#
 __metaclass__ = type
 
 import _pythonpath
@@ -23,4 +18,3 @@
         script.run()
     finally:
         script.unlock()
-

=== modified file 'daemons/buildd-slave.tac'
--- daemons/buildd-slave.tac	2010-10-20 18:43:29 +0000
+++ daemons/buildd-slave.tac	2010-12-24 16:44:20 +0000
@@ -1,8 +1,6 @@
 # Copyright 2009, 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-# Author: Daniel Silverstone <[e-mail]>
-
 # Buildd Slave implementation
 # XXX: dsilvers: 2005/01/21: Currently everything logged in the slave gets
 # passed through to the twistd log too. this could get dangerous/big
@@ -12,7 +10,8 @@
 from canonical.buildd.binarypackage import BinaryPackageBuildManager
 from canonical.buildd.sourcepackagerecipe import (
     SourcePackageRecipeBuildManager)
-from canonical.buildd.translationtemplates import TranslationTemplatesBuildManager
+from canonical.buildd.translationtemplates import (
+    TranslationTemplatesBuildManager)
 from canonical.launchpad.daemons import readyservice
 
 from twisted.web import server, resource, static
@@ -30,7 +29,8 @@
 slave.registerBuilder(BinaryPackageBuildManager, "debian")
 slave.registerBuilder(BinaryPackageBuildManager, "binarypackage")
 slave.registerBuilder(SourcePackageRecipeBuildManager, "sourcepackagerecipe")
-slave.registerBuilder(TranslationTemplatesBuildManager, 'translation-templates')
+slave.registerBuilder(
+    TranslationTemplatesBuildManager, 'translation-templates')
 
 application = service.Application('BuildDSlave')
 builddslaveService = service.IServiceCollection(application)
@@ -43,7 +43,7 @@
 root.putChild('filecache', static.File(conf.get('slave', 'filecache')))
 slavesite = server.Site(root)
 
-strports.service(slave.slave._config.get("slave","bindport"), 
+strports.service(slave.slave._config.get("slave","bindport"),
                  slavesite).setServiceParent(builddslaveService)
 
 # You can interact with a running slave like this:

=== modified file 'doc/security.txt'
--- doc/security.txt	2010-12-18 03:05:44 +0000
+++ doc/security.txt	2010-12-24 16:44:20 +0000
@@ -1,9 +1,6 @@
 Security Policy in Launchpad
 ============================
 
-Author: Brad Bollenbach
-Date: 2005-01-26
-
 Zope 3 is a security-aware framework that makes it possible to develop complex
 applications with security policies that closely resemble the reality that the
 system is trying to model.

=== modified file 'lib/canonical/buildd/__init__.py'
--- lib/canonical/buildd/__init__.py	2009-06-25 05:39:50 +0000
+++ lib/canonical/buildd/__init__.py	2010-12-24 16:44:20 +0000
@@ -1,7 +1,5 @@
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-# Author: Daniel Silverstone <[e-mail]>
-
 from canonical.buildd.slave import XMLRPCBuildDSlave
 from canonical.buildd.debian import DebianBuildManager

=== modified file 'lib/canonical/buildd/debian/launchpad-buildd.init'
--- lib/canonical/buildd/debian/launchpad-buildd.init	2010-07-22 16:12:39 +0000
+++ lib/canonical/buildd/debian/launchpad-buildd.init	2010-12-24 16:44:20 +0000
@@ -5,8 +5,6 @@
 #
 # launchpad-buildd
 #               This file is used to start and stop launchpad buildds
-#
-# Author:       Daniel Silverstone <[e-mail]>
 
 ### BEGIN INIT INFO
 # Provides:          launchpad_buildd

=== modified file 'lib/canonical/buildd/generate-translation-templates'
--- lib/canonical/buildd/generate-translation-templates	2010-05-19 15:32:21 +0000
+++ lib/canonical/buildd/generate-translation-templates	2010-12-24 16:44:20 +0000
@@ -2,8 +2,6 @@
 #
 # Copyright 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
-#
-# Author: Henning Eggers <[e-mail]>
 
 # Buildd Slave tool to generate translation templates. Boiler plate code
 # copied from sbuild-package.

=== modified file 'lib/canonical/buildd/mount-chroot'
--- lib/canonical/buildd/mount-chroot	2010-11-23 13:19:18 +0000
+++ lib/canonical/buildd/mount-chroot	2010-12-24 16:44:20 +0000
@@ -2,8 +2,6 @@
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
-#
-# Author: Daniel Silverstone <[e-mail]>
 
 # Buildd Slave tool to mount a chroot
 

=== modified file 'lib/canonical/buildd/override-sources-list'
--- lib/canonical/buildd/override-sources-list	2009-06-30 21:06:27 +0000
+++ lib/canonical/buildd/override-sources-list	2010-12-24 16:44:20 +0000
@@ -2,8 +2,6 @@
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
-#
-# Author: Colin Watson <[e-mail]>
 
 # Buildd Slave tool to override sources.list in the chroot with a list of
 # archives

=== modified file 'lib/canonical/buildd/remove-build'
--- lib/canonical/buildd/remove-build	2009-06-30 21:06:27 +0000
+++ lib/canonical/buildd/remove-build	2010-12-24 16:44:20 +0000
@@ -2,8 +2,6 @@
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
-#
-# Author: Daniel Silverstone <[e-mail]>
 
 # Buildd Slave tool to remove an unmounted chroot
 

=== modified file 'lib/canonical/buildd/scan-for-processes'
--- lib/canonical/buildd/scan-for-processes	2009-08-15 12:05:11 +0000
+++ lib/canonical/buildd/scan-for-processes	2010-12-24 16:44:20 +0000
@@ -2,8 +2,6 @@
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
-#
-# Author: Daniel Silverstone <[e-mail]>
 
 # Buildd Slave tool to scan a chroot in case any processes are underneath it
 

=== modified file 'lib/canonical/buildd/umount-chroot'
--- lib/canonical/buildd/umount-chroot	2010-11-23 13:19:18 +0000
+++ lib/canonical/buildd/umount-chroot	2010-12-24 16:44:20 +0000
@@ -2,8 +2,6 @@
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
-#
-# Author: Daniel Silverstone <[e-mail]>
 
 # Buildd Slave tool to mount a chroot
 

=== modified file 'lib/canonical/buildd/unpack-chroot'
--- lib/canonical/buildd/unpack-chroot	2009-06-30 21:06:27 +0000
+++ lib/canonical/buildd/unpack-chroot	2010-12-24 16:44:20 +0000
@@ -2,8 +2,6 @@
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
-#
-# Author: Daniel Silverstone <[e-mail]>
 
 # Buildd Slave tool to unpack a chroot tarball
 

=== modified file 'lib/canonical/buildd/update-debian-chroot'
--- lib/canonical/buildd/update-debian-chroot	2010-07-13 10:57:06 +0000
+++ lib/canonical/buildd/update-debian-chroot	2010-12-24 16:44:20 +0000
@@ -2,8 +2,6 @@
 #
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
-#
-# Author: Daniel Silverstone <[e-mail]>
 
 # Buildd Slave tool to update a debian chroot
 

=== modified file 'lib/canonical/launchpad/scripts/tests/__init__.py'
--- lib/canonical/launchpad/scripts/tests/__init__.py	2010-09-29 16:20:36 +0000
+++ lib/canonical/launchpad/scripts/tests/__init__.py	2010-12-24 16:44:20 +0000
@@ -1,15 +1,6 @@
 # Copyright 2009 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-# Author: Carlos Perello Marin <[e-mail]>
-#         David Allouche <[e-mail]>
-
-# Make this a package.
-
-# Note: by adding one's name to the copyright section, one is arguably making
-# a substantial modification.
-
-
 import os.path
 import subprocess
 

=== modified file 'lib/lp/bugs/doc/bugs-email-affects-path.txt'
--- lib/lp/bugs/doc/bugs-email-affects-path.txt	2010-10-09 16:36:22 +0000
+++ lib/lp/bugs/doc/bugs-email-affects-path.txt	2010-12-24 16:44:20 +0000
@@ -1,4 +1,5 @@
-= The 'affects' path in the Bugs e-mail interface =
+The 'affects' path in the Bugs e-mail interface
+===============================================
 
 When choosing which bugtask certain e-mail commands should modify, the
 'affects' command is used. It accepts a single argument, the name of the
@@ -33,10 +34,12 @@
     ...
     BugTargetNotFound: gnome is a group of projects. To report a bug,
                        you need to specify which of these projects the
-                       bug applies to: applets, evolution,
-                       gnome-terminal, gnomebaker, netapplet
-
-== Getting a product ==
+                       bug applies to: evolution, gnome-terminal, applets,
+                       netapplet, gnomebaker
+
+
+Getting a product
+-----------------
 
 Getting a product is done by specifying the name of the product.
 
@@ -59,7 +62,9 @@
     BugTargetNotFound: There is no project named 'unassigned'
                        registered in Launchpad.
 
-== Getting a product series ==
+
+Getting a product series
+------------------------
 
 A product series is a part of a product, so both the product and series
 name have to be given, separated with a slash.
@@ -89,7 +94,9 @@
     ...
     BugTargetNotFound: Unexpected path components: foo
 
-== Getting a distribution ==
+
+Getting a distribution
+----------------------
 
 Getting a distribution is done by specifying the name of the
 distribution.
@@ -101,14 +108,18 @@
     >>> ubuntu.name
     u'ubuntu'
 
-=== Getting a source package in a distribution ===
+
+Getting a source package in a distribution
+..........................................
 
 A distribution source package is a part of a distribution, so both the
 distribution and package name has to be specified when getting such a
 package.
 
-    >>> from lp.registry.interfaces.distributionsourcepackage import IDistributionSourcePackage
-    >>> ubuntu_evolution = AffectsEmailCommand.getBugTarget('ubuntu/evolution')
+    >>> from lp.registry.interfaces.distributionsourcepackage import (
+    ...     IDistributionSourcePackage)
+    >>> ubuntu_evolution = AffectsEmailCommand.getBugTarget(
+    ...     'ubuntu/evolution')
     >>> IDistributionSourcePackage.providedBy(ubuntu_evolution)
     True
     >>> ubuntu_evolution.name
@@ -133,7 +144,9 @@
     ...
     BugTargetNotFound: Unexpected path components: foo
 
-== Getting a distribution series ==
+
+Getting a distribution series
+-----------------------------
 
 A distribution series is a part of a distribution, so both the
 distribution and series has to be specified.
@@ -152,7 +165,8 @@
 both.
 
 
-== Getting a source package in a distribution series ==
+Getting a source package in a distribution series
+-------------------------------------------------
 
 When getting a source package within a distribution series, the source
 package is given after the distribution series.
@@ -186,7 +200,9 @@
     ...
     BugTargetNotFound: Unexpected path components: foo
 
-== Error correction ==
+
+Error correction
+----------------
 
 Previously the affects path was resolved in the same way, except that
 either /distros/ or /products/ was needed in the front. Since people are

=== modified file 'lib/lp/bugs/stories/guided-filebug/xx-project-guided-filebug.txt'
--- lib/lp/bugs/stories/guided-filebug/xx-project-guided-filebug.txt	2010-06-16 15:28:35 +0000
+++ lib/lp/bugs/stories/guided-filebug/xx-project-guided-filebug.txt	2010-12-24 16:44:20 +0000
@@ -1,4 +1,5 @@
-= Filing bugs on ProjectGroups =
+Filing bugs on ProjectGroups
+============================
 
 Even though it's not possible to file bugs against projects directly,
 it's still possible to file a bug from a project's main page.
@@ -8,8 +9,8 @@
     >>> user_browser.url
     'http://bugs.launchpad.dev/gnome/+filebug'
 
-The ProjectGroup filebug page is like a Product's filebug page, except that
-it also asks for a Product. Only Products that are using Bugs are
+The ProjectGroup filebug page is like a Product's filebug page, except
+that it also asks for a Product. Only Products that are using Bugs are
 shown in the list of options.
 
     >>> user_browser.getControl('Project').options
@@ -33,15 +34,17 @@
     >>> user_browser.getControl('Submit Bug Report').click()
     >>> user_browser.url
     'http://bugs.launchpad.dev/evolution/+bug/...'
+
     >>> user_browser.title
     'Bug #... in Evolution: ...Evolution crashes...'
 
 
-== Subscribing to a similar bug ==
+Subscribing to a similar bug
+----------------------------
 
 If our bug is described by one of the suggested similar bugs, we can
-subscribe to it instead of filing a new bug. This also loosely implies
-a "me too" vote.
+subscribe to it instead of filing a new bug. This also loosely implies a
+"me too" vote.
 
     >>> user_browser.open("http://bugs.launchpad.dev/gnome/+filebug")
     >>> user_browser.getControl('Project').value = ['evolution']
@@ -71,7 +74,8 @@
     This bug is already marked as affecting you.
 
 
-== Filing a bug when there are none similar ==
+Filing a bug when there are none similar
+----------------------------------------
 
 When no similar bugs are found the form works the same but appears
 different in the user agent.
@@ -93,22 +97,25 @@
     >>> print similar_bugs_list
     None
 
-But, as before, entering a description and submitting the bug takes
-the user to the bug page.
+But, as before, entering a description and submitting the bug takes the
+user to the bug page.
 
     >>> user_browser.getControl('Further information').value = (
     ...     'Faznambutron is a plugin designed to ...')
     >>> user_browser.getControl('Submit Bug Report').click()
     >>> user_browser.url
     'http://bugs.launchpad.dev/evolution/+bug/...'
+
     >>> user_browser.title
     'Bug #... in Evolution: ...Faznambutron dumps core...'
 
 
-== Empty ProjectGroups ==
+Empty ProjectGroups
+-------------------
 
-It isn't possible to file a bug against an empty project. However, we give the
-user some feedback in this regard. We need to create a new project first.
+It isn't possible to file a bug against an empty project. However, we
+give the user some feedback in this regard. We need to create a new
+project first.
 
     >>> admin_browser.open('http://launchpad.dev/projectgroups/+new')
     >>> admin_browser.getControl('Name:', index=0).value = 'test-group'
@@ -121,10 +128,11 @@
     >>> admin_browser.url
     'http://launchpad.dev/test-group'
 
-A user navigating to the filebug page will see an information message. The
-user can only get to the filebug page by entering its URL directly because all
-links to the page are disabled for empty project groups. Since there are users
-who would navigate to the page in that manner we test it here.
+A user navigating to the filebug page will see an information message.
+The user can only get to the filebug page by entering its URL directly
+because all links to the page are disabled for empty project groups.
+Since there are users who would navigate to the page in that manner we
+test it here.
 
     >>> user_browser.open('http://launchpad.dev/test-group/+filebug')
     >>> user_browser.url
@@ -136,8 +144,8 @@
     There are no projects registered for Test Group that use Launchpad to
     track bugs.
 
-If the project registrant visits the filebug page they will see an additional
-message:
+If the project registrant visits the filebug page they will see an
+additional message:
 
     >>> admin_browser.open('http://launchpad.dev/test-group/+filebug')
 
@@ -150,17 +158,21 @@
     it.
 
 
-== ProjectGroups With no Products Using Launchpad Bugs ==
+ProjectGroups With no Products Using Launchpad Bugs
+---------------------------------------------------
 
-If we add a new product to our test project (specifically one that doesn't use
-Launchpad for bug tracking) information about that product will also be
-displayed.
+If we add a new product to our test project (specifically one that
+doesn't use Launchpad for bug tracking) information about that product
+will also be displayed.
 
     >>> admin_browser.open('http://launchpad.dev/test-group/+newproduct')
     >>> admin_browser.getControl(name='field.name', index=0).value = 'testy'
-    >>> admin_browser.getControl(name='field.displayname').value = 'Testy Product'
-    >>> admin_browser.getControl(name='field.title').value = 'A Product for Testing'
-    >>> admin_browser.getControl(name='field.summary').value = 'Used for testing'
+    >>> admin_browser.getControl(name='field.displayname').value = (
+    ...     'Testy Product')
+    >>> admin_browser.getControl(name='field.title').value = (
+    ...     'A Product for Testing')
+    >>> admin_browser.getControl(name='field.summary').value = (
+    ...     'Used for testing')
     >>> admin_browser.getControl('Continue').click()
     >>> print admin_browser.url
     http://launchpad.dev/test-group/+newproduct
@@ -170,8 +182,8 @@
     >>> admin_browser.url
     'http://launchpad.dev/testy'
 
-The user will now see the new product on the project's +filebug page, but will
-not be able to file a bug against it.
+The user will now see the new product on the project's +filebug page,
+but will not be able to file a bug against it.
 
     >>> user_browser.reload()
     >>> for message in find_tags_by_class(user_browser.contents,
@@ -180,8 +192,8 @@
     There are no projects registered for Test Group that use Launchpad to
     track bugs.
 
-Testy Product doesn't use define an external bug tracker and isn't registered
-in any source packages and the user is told this.
+Testy Product doesn't use define an external bug tracker and isn't
+registered in any source packages and the user is told this.
 
     >>> print extract_text(find_tag_by_id(user_browser.contents,
     ...     'product-list-summary'))
@@ -197,13 +209,14 @@
     Testy Product is not registered with any source packages. You can help by
     linking them for us.
 
-The user will also be presented with a link to the product's overview page:
+The user will also be presented with a link to the product's overview
+page:
 
     >>> user_browser.getLink('Testy Product').url
     'http://launchpad.dev/testy'
 
-If we set up an external bug tracker for Testy Product, this will be reflected
-in the Test Group's filebug page.
+If we set up an external bug tracker for Testy Product, this will be
+reflected in the Test Group's filebug page.
 
     >>> from zope.component import getUtility
     >>> from canonical.launchpad.interfaces.launchpad import (
@@ -261,44 +274,11 @@
     External bug tracker: Debian Bug tracker.
     Source package: Ubuntu thunderbird (File a bug here)
 
-We should be able to follow the link to the Ubuntu thunderbird source package
-to file a bug:
+We should be able to follow the link to the Ubuntu thunderbird source
+package to file a bug:
 
     >>> user_browser.getLink('File a bug here').click()
     >>> user_browser.url
     'http://launchpad.dev/ubuntu/+source/thunderbird/+filebug'
 
-If we add a second product to the project, this too will be shown on the
-filebug page:
-
-    >>> admin_browser.open('http://launchpad.dev/test-group/+newproduct')
-    >>> admin_browser.getControl(name='field.name', index=0).value = 'second-test'
-    >>> admin_browser.getControl(name='field.displayname').value = 'Another product'
-    >>> admin_browser.getControl(name='field.title').value = 'For Testing'
-    >>> admin_browser.getControl(name='field.summary').value = 'Used for testing'
-    >>> admin_browser.getControl('Continue').click()
-    >>> print admin_browser.url
-    http://launchpad.dev/test-group/+newproduct
-
-    >>> admin_browser.getControl(name='field.licenses').value = ['GNU_GPL_V2']
-    >>> admin_browser.getControl('Complete Registration').click()
-    >>> admin_browser.url
-    'http://launchpad.dev/second-test'
-
-    >>> user_browser.open('http://launchpad.dev/test-group/+filebug')
-    >>> print extract_text(find_tag_by_id(user_browser.contents,
-    ...     'product-list-summary'))
-    There are 2 projects registered as part of Test Group but none of them use
-    Launchpad as their bug tracker.
-
-    >>> for tag in find_tags_by_class(
-    ...     user_browser.contents, 'product-bug-options'):
-    ...     print extract_text(tag)
-    Another product
-    Another product does not use an external bug tracker or has not registered
-    it with launchpad.
-    Another product is not registered with any source packages. You can help
-    by linking them for us.
-    Testy Product
-    External bug tracker: Debian Bug tracker.
-    Source package: Ubuntu thunderbird (File a bug here)
+

=== modified file 'lib/lp/registry/browser/product.py'
--- lib/lp/registry/browser/product.py	2010-12-16 19:59:20 +0000
+++ lib/lp/registry/browser/product.py	2010-12-24 16:44:20 +0000
@@ -1070,14 +1070,6 @@
     def browserLanguages(self):
         return helpers.browserLanguages(self.request)
 
-    def projproducts(self):
-        """Return a list of other products from the same project as this
-        product, excluding this product"""
-        if self.context.project is None:
-            return []
-        return [product for product in self.context.project.products
-                        if product.id != self.context.id]
-
     def getClosedBugsURL(self, series):
         status = [status.title for status in RESOLVED_BUGTASK_STATUSES]
         url = canonical_url(series) + '/+bugs'

=== modified file 'lib/lp/registry/codesofconduct/README'
--- lib/lp/registry/codesofconduct/README	2005-10-31 18:29:12 +0000
+++ lib/lp/registry/codesofconduct/README	2010-12-24 16:44:20 +0000
@@ -1,8 +1,5 @@
 = Code of Conducts Directory =
 
-Author: CelsoProvidelo
-Date: 20050217
-
 This directory should store all the CoC (Code of Conducts) releases for
 within the launchpad System.
 

=== modified file 'lib/lp/registry/doc/milestone.txt'
--- lib/lp/registry/doc/milestone.txt	2010-10-18 22:24:59 +0000
+++ lib/lp/registry/doc/milestone.txt	2010-12-24 16:44:20 +0000
@@ -1,12 +1,15 @@
-= Milestones =
+Milestones
+==========
 
-A milestone is a significant event in a project. In Malone, milestones can be
-defined to assign bug fixes to a specific release of some software.
+A milestone is a significant event in a project. In Malone, milestones
+can be defined to assign bug fixes to a specific release of some
+software.
 
 This document is about milestones in Malone.
 
 
-== Working with Milestones in Malone ==
+Working with Milestones in Malone
+---------------------------------
 
 All Milestone creation and retrieval is done through IMilestoneSet.
 IMilestoneSet can be accessed as a utility.
@@ -19,8 +22,8 @@
     >>> sorted(ms.id for ms in milestoneset)
     [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]
 
-To create a new Milestone, use the .newMilestone(name, dateexpected=None)
-method of a ProductSeries or DistroSeries:
+To create a new Milestone, use the .newMilestone(name,
+dateexpected=None) method of a ProductSeries or DistroSeries:
 
     >>> from lp.registry.interfaces.product import IProductSet
     >>> productset = getUtility(IProductSet)
@@ -28,6 +31,7 @@
     >>> ff_onedotzero = upstream_firefox.getSeries('1.0')
 
     # Only owners, experts, or admins can create a milestone.
+
     >>> login('[e-mail]')
     >>> firefox_ms = ff_onedotzero.newMilestone(
     ...     name="1.0rc1", code_name="Candidate One",
@@ -40,10 +44,13 @@
 
     >>> print firefox_ms.name
     1.0rc1
+
     >>> print firefox_ms.code_name
     Candidate One
+
     >>> print firefox_ms.displayname
     Mozilla Firefox 1.0rc1
+
     >>> print firefox_ms.title
     Mozilla Firefox 1.0rc1 "Candidate One"
 
@@ -56,6 +63,7 @@
 
     >>> print firefox_ms.target.displayname
     Mozilla Firefox
+
     >>> print firefox_ms.series_target.name
     1.0
 
@@ -64,11 +72,12 @@
     >>> firefox_ms_1_0 = milestoneset.get(1)
     >>> print firefox_ms_1_0.name
     1.0
+
     >>> print firefox_ms_1_0.displayname
     Mozilla Firefox 1.0
 
-Of course, you can also get them off a Product or Distribution using
-the getMilestone() method:
+Of course, you can also get them off a Product or Distribution using the
+getMilestone() method:
 
     >>> ms = upstream_firefox.getMilestone('1.0rc1')
     >>> print ms.name
@@ -88,22 +97,30 @@
     >>> krunch = kubuntu.getSeries('krunch')
 
     # Only owners, experts, or admins can create a milestone.
+
     >>> login('[e-mail]')
     >>> new_ms = krunch.newMilestone('1.3rc2')
     >>> print new_ms.name
     1.3rc2
+
     >>> print new_ms.code_name
     None
+
     >>> print new_ms.displayname
     Kubuntu 1.3rc2
+
     >>> print new_ms.title
     Kubuntu 1.3rc2
+
     >>> print new_ms.target.name
     kubuntu
+
     >>> print new_ms.series_target.name
     krunch
+
     >>> print kubuntu.getMilestone('foo2.3')
     None
+
     >>> print kubuntu.getMilestone('1.3rc2').dateexpected
     None
 
@@ -116,20 +133,21 @@
     NotFoundError: 'Milestone with ID -1 does not exist'
 
 
-== ProjectGroup Milestones ==
+ProjectGroup Milestones
+-----------------------
 
 The database associates milestones only with products and distroseries.
-The interface IProjectGroupMilestone provides a virtual view of milestones
-that are related to a project by collecting all milestones that are
-associated with products that belong to a project.
-
-The class ProjectMilestone collects the milestone names from products that
-belong to one project and creates virtual milestones for each distinct
-name.
-
-project.all_milestones returns all milestones for this project. No product
-belonging to the Gnome project has any milestones, hence Gnome itself has
-neither any milestones.
+The interface IProjectGroupMilestone provides a virtual view of
+milestones that are related to a project by collecting all milestones
+that are associated with products that belong to a project.
+
+The class ProjectMilestone collects the milestone names from products
+that belong to one project and creates virtual milestones for each
+distinct name.
+
+project.all_milestones returns all milestones for this project. No
+product belonging to the Gnome project has any milestones, hence Gnome
+itself has neither any milestones.
 
     >>> from lp.registry.interfaces.projectgroup import IProjectGroupSet
     >>> gnome = getUtility(IProjectGroupSet)['gnome']
@@ -137,11 +155,12 @@
     ...     print '%s %s' % (
     ...         product.name,
     ...         [milestone.title for milestone in product.all_milestones])
-    applets []
     evolution [u'Evolution 2.1.6']
     gnome-terminal []
-    gnomebaker []
+    applets []
     netapplet [u'NetApplet 1.0']
+    gnomebaker []
+
     >>> print [milestone.title for milestone in gnome.all_milestones]
     [u'GNOME 2.1.6', u'GNOME 1.0']
 
@@ -156,6 +175,7 @@
     >>> evolution = productset['evolution']
     >>> print [milestone.name for milestone in evolution.all_milestones]
     [u'2.1.6', u'1.1']
+
     >>> print [milestone.name for milestone in gnome.all_milestones]
     [u'2.1.6', u'1.1', u'1.0']
 
@@ -167,6 +187,7 @@
     >>> applets = productset['applets']
     >>> print [milestone.name for milestone in applets.all_milestones]
     [u'1.1']
+
     >>> print [milestone.name for milestone in gnome.all_milestones]
     [u'2.1.6', u'1.1', u'1.0']
 
@@ -179,50 +200,61 @@
     >>> netapplet = productset['netapplet']
     >>> print [milestone.name for milestone in netapplet.all_milestones]
     [u'1.1.', u'1.0']
+
     >>> print [milestone.name for milestone in gnome.all_milestones]
     [u'2.1.6', u'1.1.', u'1.1', u'1.0']
 
 A project milestone has the same attributes as product and distribution
-milestones, but most are None because project milestones are aggregations.
-The code_name and series attributes are always none.
+milestones, but most are None because project milestones are
+aggregations. The code_name and series attributes are always none.
 
     >>> project_milestone = gnome.all_milestones[0]
     >>> print project_milestone.name
     2.1.6
+
     >>> print project_milestone.code_name
     None
+
     >>> print project_milestone.displayname
     GNOME 2.1.6
+
     >>> print project_milestone.title
     GNOME 2.1.6
+
     >>> print project_milestone.target.name
     gnome
+
     >>> print project_milestone.series_target
     None
 
-A project milestone is active, if at least one product milestone with the
-same name is active.
+A project milestone is active, if at least one product milestone with
+the same name is active.
 
     >>> from canonical.launchpad.ftests import syncUpdate
     >>> print applets_1_1.active, evolution_1_1.active
     True True
+
     >>> print gnome.getMilestone('1.1').active
     True
+
     >>> applets_1_1.active = False
     >>> syncUpdate(applets_1_1)
     >>> print gnome.getMilestone('1.1').active
     True
+
     >>> evolution_1_1.active = False
     >>> syncUpdate(evolution_1_1)
     >>> print gnome.getMilestone('1.1').active
     False
 
-A project milestone is not shown for active milestones from inactive products.
+A project milestone is not shown for active milestones from inactive
+products.
 
     >>> print [milestone.name for milestone in gnome.milestones]
     [u'1.1.']
 
     # Unlink the source packages so the project can be deactivated.
+
     >>> from lp.testing import unlink_source_packages
     >>> unlink_source_packages(netapplet)
     >>> netapplet.active = False
@@ -231,42 +263,46 @@
     []
 
     # Reset the product back to original status so future tests pass.
+
     >>> netapplet.active = True
     >>> syncUpdate(netapplet)
 
-
-The dateexpected attribute is set to the minimum of the dateexpected values
-of the product milestones.
+The dateexpected attribute is set to the minimum of the dateexpected
+values of the product milestones.
 
     >>> print applets_1_1.dateexpected, evolution_1_1.dateexpected
     None None
+
     >>> print gnome.getMilestone('1.1').dateexpected
     None
+
     >>> from datetime import datetime
     >>> applets_1_1.dateexpected = datetime(2007, 4, 2)
     >>> syncUpdate(applets_1_1)
     >>> print gnome.getMilestone('1.1').dateexpected
     2007-04-02 00:00:00
+
     >>> evolution_1_1.dateexpected = datetime(2007, 4, 1)
     >>> syncUpdate(evolution_1_1)
     >>> print gnome.getMilestone('1.1').dateexpected
     2007-04-01 00:00:00
 
-All bugtasks that are associated with a product milestone are also associated
-with the project milestone of the same name. For details, see
+All bugtasks that are associated with a product milestone are also
+associated with the project milestone of the same name. For details, see
 bugtask-search.txt
 
 All specifications that are associated with a product milestone are also
-associated with the project milestone of the same name. No product of the
-Gnome project has yet any specifications.
+associated with the project milestone of the same name. No product of
+the Gnome project has yet any specifications.
 
     >>> for product in gnome.products:
     ...     print product.name, list(product.all_specifications)
-    applets []
     evolution []
     gnome-terminal []
-    gnomebaker []
+    applets []
     netapplet []
+    gnomebaker []
+
     >>> print list(gnome.getMilestone('1.1').specifications)
     []
 
@@ -276,11 +312,13 @@
     >>> spec = test_helper.createSpecification('1.1', 'applets')
     >>> [spec.name for spec in applets.all_specifications]
     [u'applets-specification']
+
     >>> [spec.name for spec in gnome.getMilestone('1.1').specifications]
     [u'applets-specification']
 
 
-== Target change notifications ==
+Target change notifications
+---------------------------
 
 When we change the milestone for a bug task, subscribers to both the old
 milestone and the new one are notified.
@@ -311,6 +349,7 @@
     >>> ddaa = getUtility(IPersonSet).getByName('ddaa')
     >>> milestone_one.addBugSubscription(cprov, cprov)
     <StructuralSubscription at ...>
+
     >>> milestone_two.addBugSubscription(ddaa, ddaa)
     <StructuralSubscription at ...>
 
@@ -333,6 +372,7 @@
     >>> print notification.message.chunks[0].content
     ** Changed in: firefox
         Milestone: 1.0 => 2.0
+
     >>> for recipient in notification.recipients:
     ...     print recipient.person.name, recipient.reason_header
     cprov Subscriber (Mozilla Firefox 1.0)
@@ -340,23 +380,27 @@
     ...
 
 
-== Editing milestones ==
+Editing milestones
+------------------
 
-Persons with launchpad.Edit permissions for milestones may create and edit
-them. These users play the roles of owners, drivers or Launchpad admins.
-The name, dateexpected, summary, and active, attributes are editable.
+Persons with launchpad.Edit permissions for milestones may create and
+edit them. These users play the roles of owners, drivers or Launchpad
+admins. The name, dateexpected, summary, and active, attributes are
+editable.
 
     >>> login_person(upstream_firefox.owner)
     >>> fizzy_milestone = ff_onedotzero.newMilestone('fuzzy')
 
     >>> print fizzy_milestone.name
     fuzzy
+
     >>> fizzy_milestone.name = 'fizzy'
     >>> print fizzy_milestone.name
     fizzy
 
     >>> print fizzy_milestone.code_name
     None
+
     >>> fizzy_milestone.code_name = 'dizzy'
     >>> print fizzy_milestone.code_name
     dizzy
@@ -372,12 +416,13 @@
 
     >>> fizzy_milestone.active
     True
+
     >>> fizzy_milestone.active = False
     >>> fizzy_milestone.active
     False
 
-The productseries attribute can be edited if the milestones belongs to
-a product.
+The productseries attribute can be edited if the milestones belongs to a
+product.
 
     >>> print fizzy_milestone.productseries.name
     1.0
@@ -388,8 +433,8 @@
     >>> print fizzy_milestone.productseries.name
     2.0
 
-The driver for a milestone's target cannot change a milestone, but the driver
-of the series_target is a release manager can can make changes.
+The driver for a milestone's target cannot change a milestone, but the
+driver of the series_target is a release manager can can make changes.
 
     >>> from canonical.launchpad.webapp.authorization import check_permission
 
@@ -407,65 +452,26 @@
     >>> check_permission('launchpad.Edit', fizzy_milestone)
     True
 
-# XXX sinzui 2009-07-18 bug=40978: There are milestones in the database
-# that are missing their series_target. The project owner can edit the
-# milestone to fix the issue. It is not possible in this scenario for the
-# milestone to have a driver.
-
-    >>> login_person(upstream_firefox.owner)
-
-Hack the milestone to put it in an invalid state.
-    >>> fizzy_milestone.productseries = None
-    >>> check_permission('launchpad.Edit', fizzy_milestone)
-    True
-    >>> login_person(driver)
-    >>> check_permission('launchpad.Edit', fizzy_milestone)
-    False
-
-The distroseries attribute can be edited if the milestone belongs to
-a distribution.
-
-    >>> from lp.registry.interfaces.distribution import (
-    ...     IDistributionSet)
-
-    # The factory makes the right kind of generic object for this test,
-    # but the test needs to use getUtility to get a security proxied object.
-    >>> bell_distro = factory.makeDistribution('bell')
-    >>> transaction.commit()
-    >>> bell_distro = getUtility(IDistributionSet).getByName('bell')
-    >>> login_person(bell_distro.owner)
-    >>> book_series = bell_distro.newSeries(
-    ...     'book', 'Book', 'title', 'summary', 'description',
-    ...     '1.n', None, bell_distro.owner)
-    >>> ink_milestone = book_series.newMilestone('ink')
-    >>> print ink_milestone.distroseries.name
-    book
-
-    >>> candle_series = bell_distro.newSeries(
-    ...     'candle', 'candle', 'title', 'summary', 'description',
-    ...     '2.n', book_series, bell_distro.owner)
-    >>> ink_milestone.distroseries = candle_series
-    >>> print ink_milestone.distroseries.name
-    candle
-
-
-== Deleting a milestone ==
+
+Deleting a milestone
+--------------------
 
 A milestone can be deleted using its destroySelf() method, as long as it
-doesn't have an IProductRelease associated with it, nor any bugtasks
-or specifications targeted to it.
+doesn't have an IProductRelease associated with it, nor any bugtasks or
+specifications targeted to it.
 
     >>> owner = getUtility(IPersonSet).getByName('name12')
     >>> login_person(owner)
     >>> milestone = ff_onedotzero.newMilestone('1.0.10')
     >>> print milestone.product_release
     None
+
     >>> milestone.destroySelf()
     >>> print upstream_firefox.getMilestone('1.0.10')
     None
 
-If a milestone has a product release associated with it though, it can not be
-deleted.
+If a milestone has a product release associated with it though, it can
+not be deleted.
 
     >>> from datetime import datetime
     >>> from pytz import UTC
@@ -516,8 +522,8 @@
 Closing milestone targeted bugs
 -------------------------------
 
-When a milestone with bug tasks creates a release, those bug tasks in fix
-committed status are updated to fix released. An ObjectModifiedEvent
+When a milestone with bug tasks creates a release, those bug tasks in
+fix committed status are updated to fix released. An ObjectModifiedEvent
 event is signaled for each changed bug task.
 
     >>> from canonical.launchpad.ftests.event import TestEventListener
@@ -550,3 +556,5 @@
     <DBItem BugTaskStatus.TRIAGED, (21) Triaged>
 
     >>> bugtask_event_listener.unregister()
+
+

=== modified file 'lib/lp/registry/doc/projectgroup.txt'
--- lib/lp/registry/doc/projectgroup.txt	2010-11-16 22:39:59 +0000
+++ lib/lp/registry/doc/projectgroup.txt	2010-12-24 16:44:20 +0000
@@ -23,7 +23,7 @@
     >>> evolution.translations_usage = ServiceUsage.LAUNCHPAD
     >>> logout()
     >>> login('[e-mail]')
-    >>> transaction.commit()    
+    >>> transaction.commit()
 
 Creating new projects
 ---------------------
@@ -121,8 +121,9 @@
 .products property. Note that only active products are included and they're
 ordered by their names.
 
-    >>> [product.name for product in gnome.products]
-    [u'applets', u'evolution', u'gnome-terminal', u'gnomebaker', u'netapplet']
+    >>> [product.displayname for product in gnome.products]
+    [u'Evolution', u'GNOME Terminal', u'Gnome Applets', u'NetApplet',
+     u'gnomebaker']
 
     >>> netapplet = gnome.getProduct('netapplet')
 
@@ -131,8 +132,8 @@
     >>> unlink_source_packages(netapplet)
     >>> netapplet.active = False
     >>> flush_database_updates()
-    >>> [product.name for product in gnome.products]
-    [u'applets', u'evolution', u'gnome-terminal', u'gnomebaker']
+    >>> [product.displayname for product in gnome.products]
+    [u'Evolution', u'GNOME Terminal', u'Gnome Applets', u'gnomebaker']
 
     # Re-activate netapplet so that we don't interfere in other tests below.
     >>> netapplet.active = True

=== modified file 'lib/lp/registry/model/projectgroup.py'
--- lib/lp/registry/model/projectgroup.py	2010-12-01 20:53:19 +0000
+++ lib/lp/registry/model/projectgroup.py	2010-12-24 16:44:20 +0000
@@ -169,7 +169,8 @@
 
     @property
     def products(self):
-        return Product.selectBy(project=self, active=True, orderBy='name')
+        return Product.selectBy(
+            project=self, active=True, orderBy='displayname')
 
     def getProduct(self, name):
         return Product.selectOneBy(project=self, name=name)
@@ -193,7 +194,7 @@
             Join(ProductSeries, Product.id == ProductSeries.productID),
             Join(POTemplate, ProductSeries.id == POTemplate.productseriesID),
             ]
-        # XXX j.c.sackett 2010-11-19 bug=677532 It's less than ideal that 
+        # XXX j.c.sackett 2010-11-19 bug=677532 It's less than ideal that
         # this query is using _translations_usage, but there's no cleaner
         # way to deal with it. Once the bug above is resolved, this should
         # should be fixed to use translations_usage.

=== modified file 'lib/lp/registry/stories/project/xx-project-index.txt'
--- lib/lp/registry/stories/project/xx-project-index.txt	2010-09-28 00:07:37 +0000
+++ lib/lp/registry/stories/project/xx-project-index.txt	2010-12-24 16:44:20 +0000
@@ -29,11 +29,11 @@
 
     >>> print extract_text(find_tag_by_id(anon_browser.contents, 'products'))
     Projects
-    Gnome Applets
     Evolution
     GNOME Terminal
+    Gnome Applets
+    NetApplet
     gnomebaker
-    NetApplet
     ...
 
 The projects are linked.