Merge lp:~adiroiban/launchpad/bug-496352-series-status-refactor into lp:launchpad

[Adi Roiban]

[Adi Roiban (adiroiban)]

= Bug 496352 =
Since DistroSeriesStatus is also used for ProductSeries, it should be renamed and moved to a dedicated file.

This is the note from Salgado
# XXX: salgado, 2008-06-02: We should use a more generic name here as this
# enum is used in ProductSeries.status as well.

== Proposed fix ==

Just rename the class DistroSeriesStatus to SeriesStatus and create a new module Series to host it (in the future it can contain any other common classes (interfaces).

== Implementation details ==

After touching those files, now lint complain about them.
My changes should have not affect any of the reported problems.

Any hint in fixing them is much appreciated.

== Tests ==
A full test should be ran

== Demo and Q/A ==

After these changes nothings has to be changed from the users point of view.

= Lint =

I think there is a problem with pylint setup as it does not pick up lazr modules.

Also I don't know why this interface is not accepted lib/lp/registry/interfaces/distroseries.py

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/lp/archiveuploader/uploadpolicy.py
  lib/lp/code/tests/test_branch.py
  lib/lp/registry/interfaces/distroseries.py
  lib/lp/registry/model/distribution.py
  lib/lp/testing/factory.py
  lib/lp/translations/browser/product.py
  lib/lp/translations/stories/standalone/xx-productseries-translations.txt

== Pylint notices ==

lib/lp/registry/interfaces/distroseries.py
    22: [F0401] Unable to import 'lazr.enum' (No module named enum)
    49: [F0401] Unable to import 'lazr.restful.fields' (No module named restful)
    50: [F0401] Unable to import 'lazr.restful.declarations' (No module named restful)
    115: [E1002, DistroSeriesVersionField._validate] Use super on an old style class
    426: [C0322, IDistroSeriesPublic.getPackageUploads] Operator not preceded by a space
    description=_("Return items that are more recent than this "
    ^
    "timestamp."),
    required=False),
    status=Choice(

    vocabulary=DBEnumeratedType,
    title=_("Package Upload Status"),
    description=_("Return only items that have this status."),
    required=False),
    archive=Reference(

    schema=Interface,
    title=_("Archive"),
    description=_("Return only items for this archive."),
    required=False),
    pocket=Choice(

    vocabulary=DBEnumeratedType,
    title=_("Pocket"),
    description=_("Return only items targeted to this pocket"),
    required=False),
    custom_type=Choice(

    vocabulary=DBEnumeratedType,
    title=_("Custom Type"),
    description=_("Return only items with custom files of this "
    "type."),
    required=False),
    )

    @operation_returns_collection_of(Interface)
    @export_read_operation()
    def getPackageUploads(created_since_date, status, archive, pocket,
    custom_type):

lib/lp/testing/factory.py
    17: [F0401] Unable to import 'email.Encoders' (No module named Encoders)
    18: [F0401] Unable to import 'email.Utils' (No module named Utils)
    19: [F0401] Unable to import 'email.Message' (No module named Message)
    20: [F...

[Adi Roiban (adiroiban)]

I forgot one thing.

We also have lp.registry.interfaces.distroseries.SeriesStatusMixin .
This has only internal usage for DistroSeries... maybe we should also move it or renamed it to DistroSeriesStatusMixin

[Aaron Bentley (abentley)]

This looks like a reasonable, mechanical change.

review: Approve

=== modified file 'lib/canonical/launchpad/doc/security-proxies.txt'
--- lib/canonical/launchpad/doc/security-proxies.txt	2009-08-13 15:12:16 +0000
+++ lib/canonical/launchpad/doc/security-proxies.txt	2010-01-05 16:22:16 +0000
@@ -49,13 +49,13 @@
 DB schema objects should be comparable correctly when proxied...
 
     >>> from canonical.launchpad.interfaces import (
-    ...     DistroSeriesStatus, IDistroSeriesSet)
+    ...     SeriesStatus, IDistroSeriesSet)
     >>> hoary = getUtility(IDistroSeriesSet).get(3)
     >>> print hoary.status.name
     DEVELOPMENT
-    >>> hoary.status == DistroSeriesStatus.DEVELOPMENT
+    >>> hoary.status == SeriesStatus.DEVELOPMENT
     True
-    >>> hoary.status is DistroSeriesStatus.DEVELOPMENT
+    >>> hoary.status is SeriesStatus.DEVELOPMENT
     False
 
 Finally, tear down the test:

=== modified file 'lib/canonical/launchpad/interfaces/__init__.py'
--- lib/canonical/launchpad/interfaces/__init__.py	2009-12-05 18:37:28 +0000
+++ lib/canonical/launchpad/interfaces/__init__.py	2010-01-05 16:22:16 +0000
@@ -57,6 +57,7 @@
 from lp.registry.interfaces.distributionsourcepackage import *
 from lp.soyuz.interfaces.distributionsourcepackagecache import *
 from lp.soyuz.interfaces.distributionsourcepackagerelease import *
+from lp.registry.interfaces.series import *
 from lp.soyuz.interfaces.distroarchseries import *
 from lp.soyuz.interfaces.distroarchseriesbinarypackage import *
 from lp.soyuz.interfaces.distroarchseriesbinarypackagerelease\

=== modified file 'lib/canonical/launchpad/vocabularies/dbobjects.py'
--- lib/canonical/launchpad/vocabularies/dbobjects.py	2009-10-26 18:40:04 +0000
+++ lib/canonical/launchpad/vocabularies/dbobjects.py	2010-01-05 16:22:16 +0000
@@ -90,8 +90,8 @@
 from lp.code.interfaces.branch import IBranch
 from lp.code.interfaces.branchcollection import IAllBranches
 from lp.registry.interfaces.distribution import IDistribution
-from lp.registry.interfaces.distroseries import (
-    DistroSeriesStatus, IDistroSeries)
+from lp.registry.interfaces.series import SeriesStatus
+from lp.registry.interfaces.distroseries import IDistroSeries    
 from lp.registry.interfaces.person import IPerson
 from lp.registry.interfaces.product import IProduct
 from lp.registry.interfaces.productseries import IProductSeries
@@ -780,7 +780,7 @@
         """Return all non-obsolete distribution series"""
         return [
             series for series in shortlist(self.distribution.series)
-            if series.status != DistroSeriesStatus.OBSOLETE]
+            if series.status != SeriesStatus.OBSOLETE]
 
     def _queryNominatableObjectByName(self, name):
         """See BugNominatableSeriesVocabularyBase."""

=== modified file 'lib/lp/archivepublisher/tests/test_dominator.py'
--- lib/lp/archivepublisher/tests/test_dominator.py	2009-08-28 07:34:44 +0000
+++ lib/lp/archivepublisher/tests/test_dominator.py	2010-01-05 16:22:16 +0000
@@ -14,7 +14,7 @@
 from lp.archivepublisher.domination import Dominator
 from lp.archivepublisher.publishing import Publisher
 from canonical.database.sqlbase import flush_database_updates
-from lp.registry.interfaces.distroseries import DistroSeriesStatus
+from lp.registry.interfaces.series import SeriesStatus
 from lp.soyuz.interfaces.component import IComponentSet
 from lp.registry.interfaces.person import IPersonSet
 from lp.registry.interfaces.pocket import PackagePublishingPocket
@@ -404,7 +404,7 @@
     def setUp(self):
         TestDomination.setUp(self)
         self.ubuntutest['breezy-autotest'].status = (
-            DistroSeriesStatus.OBSOLETE)
+            SeriesStatus.OBSOLETE)
 
 
 def test_suite():

=== modified file 'lib/lp/archivepublisher/tests/test_publisher.py'
--- lib/lp/archivepublisher/tests/test_publisher.py	2009-12-14 17:32:06 +0000
+++ lib/lp/archivepublisher/tests/test_publisher.py	2010-01-05 16:22:16 +0000
@@ -30,7 +30,7 @@
 from lp.soyuz.interfaces.binarypackagerelease import (
     BinaryPackageFormat)
 from lp.registry.interfaces.distribution import IDistributionSet
-from lp.registry.interfaces.distroseries import DistroSeriesStatus
+from lp.registry.interfaces.series import SeriesStatus
 from canonical.launchpad.interfaces.gpghandler import IGPGHandler
 from lp.registry.interfaces.person import IPersonSet
 from lp.registry.interfaces.pocket import PackagePublishingPocket
@@ -137,7 +137,7 @@
         distroseries is always allowed, so check for that here.
         """
         archive = self.ubuntutest.getArchiveByComponent('partner')
-        self.ubuntutest['breezy-autotest'].status = DistroSeriesStatus.CURRENT
+        self.ubuntutest['breezy-autotest'].status = SeriesStatus.CURRENT
         pub_config = getPubConfig(archive)
         pub_config.setupArchiveDirs()
         disk_pool = DiskPool(
@@ -201,7 +201,7 @@
                              PackagePublishingPocket.UPDATES)])
 
         self.ubuntutest['breezy-autotest'].status = (
-            DistroSeriesStatus.CURRENT)
+            SeriesStatus.CURRENT)
 
         pub_source = self.getPubSource(
             filecontent='foo',
@@ -645,7 +645,7 @@
         # If the distroseries is CURRENT, then the release pocket is not
         # marked as dirty.
         self.ubuntutest['breezy-autotest'].status = (
-            DistroSeriesStatus.CURRENT)
+            SeriesStatus.CURRENT)
 
         publisher.dirty_pockets = set()
         publisher.A2_markPocketsWithDeletionsDirty()

=== modified file 'lib/lp/archivepublisher/tests/util.py'
--- lib/lp/archivepublisher/tests/util.py	2009-10-26 18:40:04 +0000
+++ lib/lp/archivepublisher/tests/util.py	2010-01-05 16:22:16 +0000
@@ -8,7 +8,7 @@
 # Utility functions/classes for testing the archive publisher.
 
 from lp.archivepublisher.tests import datadir
-from canonical.launchpad.interfaces import DistroSeriesStatus
+from canonical.launchpad.interfaces import SeriesStatus
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 
 __all__ = ['FakeLogger']
@@ -44,7 +44,7 @@
         self.distribution = distro
         self.architectures = [FakeDistroArchSeries(self, "i386"),
                               FakeDistroArchSeries(self, "powerpc")]
-        self.status = DistroSeriesStatus.DEVELOPMENT
+        self.status = SeriesStatus.DEVELOPMENT
         self.distribution.registerSeries(self)
 
 

=== modified file 'lib/lp/archiveuploader/tests/test_permission.py'
--- lib/lp/archiveuploader/tests/test_permission.py	2009-11-20 22:22:53 +0000
+++ lib/lp/archiveuploader/tests/test_permission.py	2010-01-05 16:22:16 +0000
@@ -14,7 +14,7 @@
 
 from lp.archiveuploader.permission import (
     check_upload_to_archive, components_valid_for)
-from lp.registry.interfaces.distroseries import DistroSeriesStatus
+from lp.registry.interfaces.series import SeriesStatus
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.soyuz.interfaces.archive import ArchivePurpose
 from lp.soyuz.interfaces.archivepermission import IArchivePermissionSet
@@ -131,7 +131,7 @@
             purpose=ArchivePurpose.PPA, owner=person)
         spn = self.factory.makeSourcePackageName()
         distroseries = self.factory.makeDistroSeries(
-            status=DistroSeriesStatus.CURRENT)
+            status=SeriesStatus.CURRENT)
         self.assertCanUpload(
             person, spn, ppa, None, distroseries=distroseries)
 

=== modified file 'lib/lp/archiveuploader/tests/test_uploadprocessor.py'
--- lib/lp/archiveuploader/tests/test_uploadprocessor.py	2009-11-18 02:58:23 +0000
+++ lib/lp/archiveuploader/tests/test_uploadprocessor.py	2010-01-05 16:22:16 +0000
@@ -38,7 +38,7 @@
     SourcePackageRelease)
 from canonical.launchpad.ftests import import_public_test_keys
 from lp.registry.interfaces.distribution import IDistributionSet
-from lp.registry.interfaces.distroseries import DistroSeriesStatus
+from lp.registry.interfaces.series import SeriesStatus
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.registry.interfaces.sourcepackage import SourcePackageFileType
 from lp.soyuz.interfaces.archive import ArchivePurpose, IArchiveSet
@@ -493,7 +493,7 @@
 
         # Make ubuntu/breezy a frozen distro, so a source upload for an
         # existing package will be allowed, but unapproved.
-        self.breezy.status = DistroSeriesStatus.FROZEN
+        self.breezy.status = SeriesStatus.FROZEN
         self.layer.txn.commit()
 
         # Upload a newer version of bar.
@@ -576,7 +576,7 @@
         See bug 369512.
         """
         self._checkCopyArchiveUploadToDistro(
-            PackagePublishingPocket.RELEASE, DistroSeriesStatus.CURRENT)
+            PackagePublishingPocket.RELEASE, SeriesStatus.CURRENT)
 
     def testCopyArchiveUploadToSupportedDistro(self):
         """Check binary copy archive uploads to RELEASE pockets.
@@ -588,7 +588,7 @@
         See bug 369512.
         """
         self._checkCopyArchiveUploadToDistro(
-            PackagePublishingPocket.RELEASE, DistroSeriesStatus.SUPPORTED)
+            PackagePublishingPocket.RELEASE, SeriesStatus.SUPPORTED)
 
     def testDuplicatedBinaryUploadGetsRejected(self):
         """The upload processor rejects duplicated binary uploads.
@@ -964,7 +964,7 @@
     def testPartnerUploadToProposedPocket(self):
         """Upload a partner package to the proposed pocket."""
         self.setupBreezy()
-        self.breezy.status = DistroSeriesStatus.CURRENT
+        self.breezy.status = SeriesStatus.CURRENT
         self.layer.txn.commit()
         self.options.context = 'insecure'
         uploadprocessor = UploadProcessor(
@@ -983,7 +983,7 @@
         distroseries is allowed.
         """
         self.setupBreezy()
-        self.breezy.status = DistroSeriesStatus.CURRENT
+        self.breezy.status = SeriesStatus.CURRENT
         self.layer.txn.commit()
         self.options.context = 'insecure'
         uploadprocessor = UploadProcessor(
@@ -1029,21 +1029,21 @@
 
         # Check unstable states:
 
-        self.breezy.status = DistroSeriesStatus.DEVELOPMENT
+        self.breezy.status = SeriesStatus.DEVELOPMENT
         self.layer.txn.commit()
         self._uploadPartnerToNonReleasePocketAndCheckFail()
 
-        self.breezy.status = DistroSeriesStatus.EXPERIMENTAL
+        self.breezy.status = SeriesStatus.EXPERIMENTAL
         self.layer.txn.commit()
         self._uploadPartnerToNonReleasePocketAndCheckFail()
 
         # Check stable states:
 
-        self.breezy.status = DistroSeriesStatus.CURRENT
+        self.breezy.status = SeriesStatus.CURRENT
         self.layer.txn.commit()
         self._uploadPartnerToNonReleasePocketAndCheckFail()
 
-        self.breezy.status = DistroSeriesStatus.SUPPORTED
+        self.breezy.status = SeriesStatus.SUPPORTED
         self.layer.txn.commit()
         self._uploadPartnerToNonReleasePocketAndCheckFail()
 

=== modified file 'lib/lp/archiveuploader/uploadpolicy.py'
--- lib/lp/archiveuploader/uploadpolicy.py	2009-11-24 23:12:23 +0000
+++ lib/lp/archiveuploader/uploadpolicy.py	2010-01-05 16:22:16 +0000
@@ -11,9 +11,8 @@
 
 from canonical.launchpad.interfaces import ILaunchpadCelebrities
 from lp.registry.interfaces.distribution import IDistributionSet
-from lp.registry.interfaces.distroseries import DistroSeriesStatus
+from lp.registry.interfaces.series import SeriesStatus
 from lp.registry.interfaces.pocket import PackagePublishingPocket
-from lp.soyuz.interfaces.archive import ArchivePurpose
 
 
 # Number of seconds in an hour (used later)
@@ -295,7 +294,7 @@
 
         if self.pocket == PackagePublishingPocket.RELEASE:
             if (self.distroseries.status !=
-                DistroSeriesStatus.FROZEN):
+                SeriesStatus.FROZEN):
                 return True
         return False
 

=== modified file 'lib/lp/bugs/doc/bug-nomination.txt'
--- lib/lp/bugs/doc/bug-nomination.txt	2009-10-26 18:40:04 +0000
+++ lib/lp/bugs/doc/bug-nomination.txt	2010-01-05 16:22:16 +0000
@@ -640,12 +640,12 @@
 NominationSeriesObsoleteError. Let's make a new obsolete distroseries
 to demonstrate.
 
-    >>> from canonical.launchpad.interfaces import DistroSeriesStatus
+    >>> from canonical.launchpad.interfaces import SeriesStatus
 
     >>> login("[e-mail]")
     >>> ubuntu_edgy = factory.makeDistroRelease(
     ...     distribution=ubuntu, version='6.10',
-    ...     status=DistroSeriesStatus.OBSOLETE)
+    ...     status=SeriesStatus.OBSOLETE)
     >>> login("[e-mail]")
 
     >>> bug_one.addNomination(target=ubuntu_edgy, owner=no_privs)

=== modified file 'lib/lp/bugs/model/bug.py'
--- lib/lp/bugs/model/bug.py	2009-12-14 15:25:55 +0000
+++ lib/lp/bugs/model/bug.py	2010-01-05 16:22:16 +0000
@@ -90,8 +90,8 @@
 from lp.registry.interfaces.distribution import IDistribution
 from lp.registry.interfaces.distributionsourcepackage import (
     IDistributionSourcePackage)
-from lp.registry.interfaces.distroseries import (
-    DistroSeriesStatus, IDistroSeries)
+from lp.registry.interfaces.series import SeriesStatus
+from lp.registry.interfaces.distroseries import IDistroSeries
 from lp.registry.interfaces.person import IPersonSet
 from lp.registry.interfaces.person import validate_public_person
 from lp.registry.interfaces.product import IProduct
@@ -1086,7 +1086,7 @@
         productseries = None
         if IDistroSeries.providedBy(target):
             distroseries = target
-            if target.status == DistroSeriesStatus.OBSOLETE:
+            if target.status == SeriesStatus.OBSOLETE:
                 raise NominationSeriesObsoleteError(
                     "%s is an obsolete series." % target.bugtargetdisplayname)
         else:

=== modified file 'lib/lp/code/browser/branchlisting.py'
--- lib/lp/code/browser/branchlisting.py	2009-11-11 01:53:33 +0000
+++ lib/lp/code/browser/branchlisting.py	2010-01-05 16:22:16 +0000
@@ -85,7 +85,7 @@
     IFindOfficialBranchLinks)
 from lp.registry.browser.product import (
     ProductDownloadFileMixin, SortSeriesMixin)
-from lp.registry.interfaces.distroseries import DistroSeriesStatus
+from lp.registry.interfaces.series import SeriesStatus
 from lp.registry.interfaces.person import IPerson, IPersonSet
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.registry.interfaces.product import IProduct
@@ -170,7 +170,7 @@
     @property
     def active_series(self):
         return [series for series in self.associated_product_series
-                if series.status != DistroSeriesStatus.OBSOLETE]
+                if series.status != SeriesStatus.OBSOLETE]
 
     @property
     def bzr_identity(self):

=== modified file 'lib/lp/code/tests/helpers.py'
--- lib/lp/code/tests/helpers.py	2009-12-10 01:49:16 +0000
+++ lib/lp/code/tests/helpers.py	2010-01-05 16:22:16 +0000
@@ -21,7 +21,7 @@
 
 from lp.code.interfaces.seriessourcepackagebranch import (
     IMakeOfficialBranchLinks)
-from lp.registry.interfaces.distroseries import DistroSeriesStatus
+from lp.registry.interfaces.series import SeriesStatus
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.testing import time_counter
 
@@ -185,14 +185,14 @@
     mint = factory.makeDistribution(
         name='mint', displayname='Mint', owner=albert, members=mint_team)
     series = [
-        ("wild", "5.5", DistroSeriesStatus.EXPERIMENTAL),
-        ("dev", "4.0", DistroSeriesStatus.DEVELOPMENT),
-        ("stable", "3.0", DistroSeriesStatus.CURRENT),
-        ("old", "2.0", DistroSeriesStatus.SUPPORTED),
-        ("very-old", "1.5", DistroSeriesStatus.SUPPORTED),
-        ("ancient", "1.0", DistroSeriesStatus.SUPPORTED),
-        ("mouldy", "0.6", DistroSeriesStatus.SUPPORTED),
-        ("dead", "0.1", DistroSeriesStatus.OBSOLETE),
+        ("wild", "5.5", SeriesStatus.EXPERIMENTAL),
+        ("dev", "4.0", SeriesStatus.DEVELOPMENT),
+        ("stable", "3.0", SeriesStatus.CURRENT),
+        ("old", "2.0", SeriesStatus.SUPPORTED),
+        ("very-old", "1.5", SeriesStatus.SUPPORTED),
+        ("ancient", "1.0", SeriesStatus.SUPPORTED),
+        ("mouldy", "0.6", SeriesStatus.SUPPORTED),
+        ("dead", "0.1", SeriesStatus.OBSOLETE),
         ]
     for name, version, status in series:
         factory.makeDistroRelease(

=== modified file 'lib/lp/code/tests/test_branch.py'
--- lib/lp/code/tests/test_branch.py	2009-11-13 05:13:07 +0000
+++ lib/lp/code/tests/test_branch.py	2010-01-05 16:22:16 +0000
@@ -15,9 +15,9 @@
 from lp.archiveuploader.permission import verify_upload
 from lp.code.enums import (
     BranchSubscriptionDiffSize, BranchSubscriptionNotificationLevel,
-    BranchType, CodeReviewNotificationLevel)
+    CodeReviewNotificationLevel)
 from lp.code.interfaces.linkedbranch import ICanHasLinkedBranch
-from lp.registry.interfaces.distroseries import DistroSeriesStatus
+from lp.registry.interfaces.series import SeriesStatus
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.soyuz.interfaces.archivepermission import IArchivePermissionSet
 from lp.testing import run_with_login, TestCaseWithFactory
@@ -247,7 +247,7 @@
         # Make sure the (distroseries, pocket) combination used allows us to
         # upload to it.
         stable_states = (
-            DistroSeriesStatus.SUPPORTED, DistroSeriesStatus.CURRENT)
+            SeriesStatus.SUPPORTED, SeriesStatus.CURRENT)
         if branch.distroseries.status in stable_states:
             pocket = PackagePublishingPocket.BACKPORTS
         else:

=== modified file 'lib/lp/registry/browser/distribution.py'
--- lib/lp/registry/browser/distribution.py	2009-12-05 18:37:28 +0000
+++ lib/lp/registry/browser/distribution.py	2010-01-05 16:22:16 +0000
@@ -70,7 +70,7 @@
     IDistributionSet)
 from lp.registry.interfaces.distributionmirror import (
     IDistributionMirrorSet, MirrorContent, MirrorSpeed)
-from lp.registry.interfaces.distroseries import DistroSeriesStatus
+from lp.registry.interfaces.series import SeriesStatus
 from lp.registry.interfaces.product import IProduct
 from lp.soyuz.interfaces.publishedpackage import (
     IPublishedPackageSet)
@@ -812,9 +812,9 @@
 
     def getCssClass(self, series):
         """The highlighted, unhighlighted, or dimmed CSS class."""
-        if series.status == DistroSeriesStatus.DEVELOPMENT:
+        if series.status == SeriesStatus.DEVELOPMENT:
             return 'highlighted'
-        elif series.status == DistroSeriesStatus.OBSOLETE:
+        elif series.status == SeriesStatus.OBSOLETE:
             return 'dimmed'
         else:
             return 'unhighlighted'

=== modified file 'lib/lp/registry/browser/distroseries.py'
--- lib/lp/registry/browser/distroseries.py	2009-12-18 13:25:19 +0000
+++ lib/lp/registry/browser/distroseries.py	2010-01-05 16:22:16 +0000
@@ -35,8 +35,8 @@
 from canonical.launchpad.browser.packagesearch import PackageSearchViewBase
 from lp.soyuz.browser.queue import QueueItemsView
 from lp.services.worlddata.interfaces.country import ICountry
-from lp.registry.interfaces.distroseries import (
-    DistroSeriesStatus, IDistroSeries)
+from lp.registry.interfaces.series import SeriesStatus
+from lp.registry.interfaces.distroseries import IDistroSeries
 from lp.translations.interfaces.distroserieslanguage import (
     IDistroSeriesLanguageSet)
 from lp.services.worlddata.interfaces.language import ILanguageSet
@@ -244,7 +244,7 @@
     label = 'Search packages'
 
 
-class DistroSeriesStatusMixin:
+class SeriesStatusMixin:
     """A mixin that provides status field support."""
 
     def createStatusField(self):
@@ -256,15 +256,15 @@
          * unstable -> EXPERIMENTAL, DEVELOPMENT, FROZEN, FUTURE, CURRENT
         """
         stable_status = (
-            DistroSeriesStatus.CURRENT,
-            DistroSeriesStatus.SUPPORTED,
-            DistroSeriesStatus.OBSOLETE,
+            SeriesStatus.CURRENT,
+            SeriesStatus.SUPPORTED,
+            SeriesStatus.OBSOLETE,
             )
 
         if self.context.status not in stable_status:
-            terms = [status for status in DistroSeriesStatus.items
+            terms = [status for status in SeriesStatus.items
                      if status not in stable_status]
-            terms.append(DistroSeriesStatus.CURRENT)
+            terms.append(SeriesStatus.CURRENT)
         else:
             terms = stable_status
 
@@ -282,7 +282,7 @@
     def updateDateReleased(self, status):
         """Update the datereleased field if the status is set to CURRENT."""
         if (self.context.datereleased is None and
-            status == DistroSeriesStatus.CURRENT):
+            status == SeriesStatus.CURRENT):
             self.context.datereleased = UTC_NOW
 
 
@@ -328,7 +328,7 @@
     milestone_can_release = False
 
 
-class DistroSeriesEditView(LaunchpadEditFormView, DistroSeriesStatusMixin):
+class DistroSeriesEditView(LaunchpadEditFormView, SeriesStatusMixin):
     """View class that lets you edit a DistroSeries object.
 
     It redirects to the main distroseries page after a successful edit.
@@ -375,7 +375,7 @@
         self.next_url = canonical_url(self.context)
 
 
-class DistroSeriesAdminView(LaunchpadEditFormView, DistroSeriesStatusMixin):
+class DistroSeriesAdminView(LaunchpadEditFormView, SeriesStatusMixin):
     """View class for administering a DistroSeries object.
 
     It redirects to the main distroseries page after a successful edit.

=== modified file 'lib/lp/registry/browser/product.py'
--- lib/lp/registry/browser/product.py	2009-12-11 19:54:04 +0000
+++ lib/lp/registry/browser/product.py	2010-01-05 16:22:16 +0000
@@ -66,7 +66,7 @@
     ILaunchBag, NotFoundError, UnsafeFormGetSubmissionError)
 from lp.registry.interfaces.pillar import IPillarNameSet
 from lp.registry.interfaces.product import IProductReviewSearch, License
-from lp.registry.interfaces.distroseries import DistroSeriesStatus
+from lp.registry.interfaces.series import SeriesStatus
 from lp.registry.interfaces.product import (
     IProduct, IProductSet, LicenseStatus)
 from lp.registry.interfaces.productrelease import (
@@ -540,7 +540,7 @@
         # Callback for the filter which only allows series that have not been
         # marked obsolete.
         def check_active(series):
-            return series.status != DistroSeriesStatus.OBSOLETE
+            return series.status != SeriesStatus.OBSOLETE
         return self._sorted_filtered_list(check_active)
 
 
@@ -618,7 +618,7 @@
         """The highlighted, unhighlighted, or dimmed CSS class."""
         if self.is_development_focus:
             return 'highlighted'
-        elif self.status == DistroSeriesStatus.OBSOLETE:
+        elif self.status == SeriesStatus.OBSOLETE:
             return 'dimmed'
         else:
             return 'unhighlighted'

=== modified file 'lib/lp/registry/browser/productseries.py'
--- lib/lp/registry/browser/productseries.py	2009-12-05 18:37:28 +0000
+++ lib/lp/registry/browser/productseries.py	2010-01-05 16:22:16 +0000
@@ -75,7 +75,7 @@
 from lp.registry.browser import (
     MilestoneOverlayMixin, RegistryDeleteViewMixin)
 from lp.registry.browser.packaging import PackagingAddView
-from lp.registry.interfaces.distroseries import DistroSeriesStatus
+from lp.registry.interfaces.series import SeriesStatus
 from lp.registry.interfaces.productseries import IProductSeries
 
 
@@ -329,7 +329,7 @@
         them for obsolete series can be a problem if many series are being
         displayed.
         """
-        return self.context.status == DistroSeriesStatus.OBSOLETE
+        return self.context.status == SeriesStatus.OBSOLETE
 
     @cachedproperty
     def bugtask_status_counts(self):

=== modified file 'lib/lp/registry/browser/tests/browser-views.txt'
--- lib/lp/registry/browser/tests/browser-views.txt	2009-09-10 22:09:44 +0000
+++ lib/lp/registry/browser/tests/browser-views.txt	2010-01-05 16:22:16 +0000
@@ -35,7 +35,7 @@
 attribute has the required attribute to sort.
 
     >>> from lp.registry.browser import get_status_counts
-    >>> from lp.registry.interfaces.distroseries import DistroSeriesStatus
+    >>> from lp.registry.interfaces.series import SeriesStatus
 
     >>> class Concept:
     ...     def __init__(self, status, person):
@@ -48,9 +48,9 @@
     >>> a_person = factory.makePerson(name='andy', displayname="Andy")
     >>> b_person = factory.makePerson(name='bob', displayname="Bob")
 
-    >>> concept_1 = Concept(DistroSeriesStatus.EXPERIMENTAL, a_person)
-    >>> artefact_2 = Artefact(DistroSeriesStatus.EXPERIMENTAL, b_person)
-    >>> artefact_3 = Artefact(DistroSeriesStatus.CURRENT, b_person)
+    >>> concept_1 = Concept(SeriesStatus.EXPERIMENTAL, a_person)
+    >>> artefact_2 = Artefact(SeriesStatus.EXPERIMENTAL, b_person)
+    >>> artefact_3 = Artefact(SeriesStatus.CURRENT, b_person)
 
 The common example is for counting the status enums for an object. The default
 rule is to sort on the 'sortkey' attribute of the object being counted.

=== modified file 'lib/lp/registry/browser/tests/distributionsourcepackage-views.txt'
--- lib/lp/registry/browser/tests/distributionsourcepackage-views.txt	2009-11-10 21:33:20 +0000
+++ lib/lp/registry/browser/tests/distributionsourcepackage-views.txt	2010-01-05 16:22:16 +0000
@@ -10,8 +10,8 @@
     >>> publisher = SoyuzTestPublisher()
     >>> publisher.prepareBreezyAutotest()
     >>> ubuntutest = publisher.ubuntutest
-    >>> from lp.registry.interfaces.distroseries import DistroSeriesStatus
-    >>> publisher.distroseries.status = DistroSeriesStatus.DEVELOPMENT
+    >>> from lp.registry.interfaces.series import SeriesStatus
+    >>> publisher.distroseries.status = SeriesStatus.DEVELOPMENT
 
     # Publish the source 'gedit' in the ubuntutest main archive.
     >>> from datetime import datetime

=== modified file 'lib/lp/registry/browser/tests/packaging-views.txt'
--- lib/lp/registry/browser/tests/packaging-views.txt	2009-12-10 20:03:11 +0000
+++ lib/lp/registry/browser/tests/packaging-views.txt	2010-01-05 16:22:16 +0000
@@ -206,12 +206,12 @@
 When the current Ubuntu series changes, the sourcepackagename is not known,
 and a new entry can be added to the packaging history.
 
-    >>> from lp.registry.interfaces.distroseries import DistroSeriesStatus
+    >>> from lp.registry.interfaces.series import SeriesStatus
 
     >>> login('[e-mail]')
-    >>> hoary.status = DistroSeriesStatus.CURRENT
+    >>> hoary.status = SeriesStatus.CURRENT
     >>> grumpy_series = ubuntu.getSeries('grumpy')
-    >>> grumpy_series.status = DistroSeriesStatus.FROZEN
+    >>> grumpy_series.status = SeriesStatus.FROZEN
 
     >>> a_user = factory.makePerson(name="hedgehog")
     >>> login_person(a_user)

=== modified file 'lib/lp/registry/browser/tests/productseries-views.txt'
--- lib/lp/registry/browser/tests/productseries-views.txt	2009-12-05 02:53:07 +0000
+++ lib/lp/registry/browser/tests/productseries-views.txt	2010-01-05 16:22:16 +0000
@@ -81,14 +81,14 @@
 has an is_obsolete property that templates can check when choosing the content
 to display.
 
-    >>> from lp.registry.interfaces.distroseries import DistroSeriesStatus
+    >>> from lp.registry.interfaces.series import SeriesStatus
 
     >>> print series.status
     Active Development
     >>> view.is_obsolete
     False
 
-    >>> series.status = DistroSeriesStatus.OBSOLETE
+    >>> series.status = SeriesStatus.OBSOLETE
     >>> view = create_view(series, '+index')
     >>> view.is_obsolete
     True

=== modified file 'lib/lp/registry/doc/distroseries.txt'
--- lib/lp/registry/doc/distroseries.txt	2009-12-10 20:28:03 +0000
+++ lib/lp/registry/doc/distroseries.txt	2010-01-05 16:22:16 +0000
@@ -170,7 +170,7 @@
    >>> hoary = ubuntu['hoary']
 
    >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
-   >>> from canonical.launchpad.interfaces import DistroSeriesStatus
+   >>> from canonical.launchpad.interfaces import SeriesStatus
 
    >>> warty.status.name
    'CURRENT'
@@ -190,7 +190,7 @@
 the upload will have to wait for manual approval anyway:
 
    >>> from zope.security.proxy import removeSecurityProxy
-   >>> removeSecurityProxy(hoary).status = DistroSeriesStatus.FROZEN
+   >>> removeSecurityProxy(hoary).status = SeriesStatus.FROZEN
 
    >>> hoary.status.name
    'FROZEN'
@@ -430,35 +430,35 @@
 
 Exactly what message is displayed depends on the series' status.
 
-    >>> untranslatable_series.status = DistroSeriesStatus.EXPERIMENTAL
-    >>> print get_visibility_notice(untranslatable_series)
-    Translations for this release series are not available yet.
-
-    >>> untranslatable_series.status = DistroSeriesStatus.DEVELOPMENT
-    >>> print get_visibility_notice(untranslatable_series)
-    Translations for this release series are not available yet.
-
-    >>> untranslatable_series.status = DistroSeriesStatus.FROZEN
-    >>> print get_visibility_notice(untranslatable_series)
-    Translations for this release series are not currently available.
-    Please come back soon.
-
-    >>> untranslatable_series.status = DistroSeriesStatus.CURRENT
-    >>> print get_visibility_notice(untranslatable_series)
-    Translations for this release series are not currently available.
-    Please come back soon.
-
-    >>> untranslatable_series.status = DistroSeriesStatus.SUPPORTED
-    >>> print get_visibility_notice(untranslatable_series)
-    Translations for this release series are not currently available.
-    Please come back soon.
-
-    >>> untranslatable_series.status = DistroSeriesStatus.OBSOLETE
+    >>> untranslatable_series.status = SeriesStatus.EXPERIMENTAL
+    >>> print get_visibility_notice(untranslatable_series)
+    Translations for this release series are not available yet.
+
+    >>> untranslatable_series.status = SeriesStatus.DEVELOPMENT
+    >>> print get_visibility_notice(untranslatable_series)
+    Translations for this release series are not available yet.
+
+    >>> untranslatable_series.status = SeriesStatus.FROZEN
+    >>> print get_visibility_notice(untranslatable_series)
+    Translations for this release series are not currently available.
+    Please come back soon.
+
+    >>> untranslatable_series.status = SeriesStatus.CURRENT
+    >>> print get_visibility_notice(untranslatable_series)
+    Translations for this release series are not currently available.
+    Please come back soon.
+
+    >>> untranslatable_series.status = SeriesStatus.SUPPORTED
+    >>> print get_visibility_notice(untranslatable_series)
+    Translations for this release series are not currently available.
+    Please come back soon.
+
+    >>> untranslatable_series.status = SeriesStatus.OBSOLETE
     >>> print get_visibility_notice(untranslatable_series)
     This release series is obsolete.  Its translations are no longer
     available.
 
-    >>> untranslatable_series.status = DistroSeriesStatus.FUTURE
+    >>> untranslatable_series.status = SeriesStatus.FUTURE
     >>> print get_visibility_notice(untranslatable_series)
     Translations for this release series are not available yet.
 

=== modified file 'lib/lp/registry/doc/product.txt'
--- lib/lp/registry/doc/product.txt	2009-10-26 18:40:04 +0000
+++ lib/lp/registry/doc/product.txt	2010-01-05 16:22:16 +0000
@@ -636,11 +636,10 @@
 Once the 1.0 series is made obsolete, it no longer shows up in the set of
 sorted active series.
 
-    >>> from lp.registry.interfaces.distroseries import (
-    ...     DistroSeriesStatus)
+    >>> from lp.registry.interfaces.series import SeriesStatus
     >>> sorted_series = firefox_view.sorted_active_series_list
     >>> last_series = firefox.getSeries(sorted_series[-1].name)
-    >>> last_series.status = DistroSeriesStatus.OBSOLETE
+    >>> last_series.status = SeriesStatus.OBSOLETE
     >>> firefox_view = create_initialized_view(firefox, '+index')
     >>> for series in firefox_view.sorted_active_series_list:
     ...     print series.name
@@ -649,7 +648,7 @@
 It is possible for the development series to be obsolete, and in that case, it
 still shows up in the list.
 
-    >>> firefox.development_focus.status = DistroSeriesStatus.OBSOLETE
+    >>> firefox.development_focus.status = SeriesStatus.OBSOLETE
     >>> firefox_view = create_initialized_view(firefox, '+index')
     >>> for series in firefox_view.sorted_active_series_list:
     ...     print series.name

=== modified file 'lib/lp/registry/interfaces/distroseries.py'
--- lib/lp/registry/interfaces/distroseries.py	2009-12-14 13:49:03 +0000
+++ lib/lp/registry/interfaces/distroseries.py	2010-01-05 16:22:16 +0000
@@ -8,7 +8,6 @@
 __metaclass__ = type
 
 __all__ = [
-    'DistroSeriesStatus',
     'IDistroSeries',
     'IDistroSeriesEditRestricted',
     'IDistroSeriesPublic',
@@ -20,11 +19,12 @@
 from zope.schema import Bool, Datetime, Choice, Object, TextLine
 from zope.interface import Interface, Attribute
 
-from lazr.enum import DBEnumeratedType, DBItem
+from lazr.enum import DBEnumeratedType
 
 from canonical.launchpad.fields import (
     ContentNameField, Description, PublicPersonChoice, Summary, Title,
     UniqueField)
+from lp.registry.interfaces.series import SeriesStatus
 from lp.registry.interfaces.structuralsubscription import (
     IStructuralSubscriptionTarget)
 from lp.bugs.interfaces.bugtarget import IBugTarget, IHasBugs
@@ -54,73 +54,6 @@
     operation_returns_collection_of, operation_returns_entry,
     rename_parameters_as, webservice_error)
 
-
-# XXX: salgado, 2008-06-02: We should use a more generic name here as this
-# enum is used in ProductSeries.status as well.
-class DistroSeriesStatus(DBEnumeratedType):
-    """Distro/Product Series Status
-
-    A Distro or Product series (warty, hoary, 1.4 for example) changes state
-    throughout its development. This schema describes the level of
-    development of the series.
-    """
-
-    EXPERIMENTAL = DBItem(1, """
-        Experimental
-
-        This series contains code that is far from active release planning or
-        management.
-
-        In the case of Ubuntu, series that are beyond the current
-        "development" release will be marked as "experimental". We create
-        those so that people have a place to upload code which is expected to
-        be part of that distant future release, but which we do not want to
-        interfere with the current development release.
-        """)
-
-    DEVELOPMENT = DBItem(2, """
-        Active Development
-
-        The series that is under active development.
-        """)
-
-    FROZEN = DBItem(3, """
-        Pre-release Freeze
-
-        When a series is near to release the administrators will freeze it,
-        which typically means all changes require significant review before
-        being accepted.
-        """)
-
-    CURRENT = DBItem(4, """
-        Current Stable Release
-
-        This is the latest stable release. Normally there will only
-        be one of these for a given distribution.
-        """)
-
-    SUPPORTED = DBItem(5, """
-        Supported
-
-        This series is still supported, but it is no longer the current stable
-        release.
-        """)
-
-    OBSOLETE = DBItem(6, """
-        Obsolete
-
-        This series is no longer supported, it is considered obsolete and
-        should not be used on production systems.
-        """)
-
-    FUTURE = DBItem(7, """
-        Future
-
-        This is a future series of this product/distro in which the developers
-        haven't started working yet.
-        """)
-
-
 class DistroSeriesNameField(ContentNameField):
     """A class to ensure `IDistroSeries` has unique names."""
     errormessage = _("%s is already in use by another series.")
@@ -273,7 +206,7 @@
     status = exported(
         Choice(
             title=_("Status"), required=True,
-            vocabulary=DistroSeriesStatus))
+            vocabulary=SeriesStatus))
     datereleased = exported(
         Datetime(title=_("Date released")))
     parent_series = exported(

=== modified file 'lib/lp/registry/interfaces/productseries.py'
--- lib/lp/registry/interfaces/productseries.py	2009-12-05 18:37:28 +0000
+++ lib/lp/registry/interfaces/productseries.py	2010-01-05 16:22:16 +0000
@@ -25,7 +25,7 @@
     IStructuralSubscriptionTarget)
 from lp.code.interfaces.branch import IBranch
 from lp.bugs.interfaces.bugtarget import IBugTarget
-from lp.registry.interfaces.distroseries import DistroSeriesStatus
+from lp.registry.interfaces.series import SeriesStatus
 from canonical.launchpad.interfaces.launchpad import (
     IHasAppointedDriver, IHasDrivers)
 from lp.registry.interfaces.role import IHasOwner
@@ -106,8 +106,8 @@
 
     status = exported(
         Choice(
-            title=_('Status'), required=True, vocabulary=DistroSeriesStatus,
-            default=DistroSeriesStatus.DEVELOPMENT))
+            title=_('Status'), required=True, vocabulary=SeriesStatus,
+            default=SeriesStatus.DEVELOPMENT))
 
     parent = Attribute('The structural parent of this series - the product')
 

=== added file 'lib/lp/registry/interfaces/series.py'
--- lib/lp/registry/interfaces/series.py	1970-01-01 00:00:00 +0000
+++ lib/lp/registry/interfaces/series.py	2010-01-05 16:22:16 +0000
@@ -0,0 +1,78 @@
+# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+# pylint: disable-msg=E0211,E0213
+
+"""Interfaces including common IDistroSeries and IProductSeries classes."""
+
+__metaclass__ = type
+
+__all__ = [
+    'SeriesStatus'
+    ]
+
+from lazr.enum import DBEnumeratedType, DBItem
+
+class SeriesStatus(DBEnumeratedType):
+    """Distro/Product Series Status
+
+    A Distro or Product series (warty, hoary, 1.4 for example) changes state
+    throughout its development. This schema describes the level of
+    development of the series.
+    """
+
+    EXPERIMENTAL = DBItem(1, """
+        Experimental
+
+        This series contains code that is far from active release planning or
+        management.
+
+        In the case of Ubuntu, series that are beyond the current
+        "development" release will be marked as "experimental". We create
+        those so that people have a place to upload code which is expected to
+        be part of that distant future release, but which we do not want to
+        interfere with the current development release.
+        """)
+
+    DEVELOPMENT = DBItem(2, """
+        Active Development
+
+        The series that is under active development.
+        """)
+
+    FROZEN = DBItem(3, """
+        Pre-release Freeze
+
+        When a series is near to release the administrators will freeze it,
+        which typically means all changes require significant review before
+        being accepted.
+        """)
+
+    CURRENT = DBItem(4, """
+        Current Stable Release
+
+        This is the latest stable release. Normally there will only
+        be one of these for a given distribution.
+        """)
+
+    SUPPORTED = DBItem(5, """
+        Supported
+
+        This series is still supported, but it is no longer the current stable
+        release.
+        """)
+
+    OBSOLETE = DBItem(6, """
+        Obsolete
+
+        This series is no longer supported, it is considered obsolete and
+        should not be used on production systems.
+        """)
+
+    FUTURE = DBItem(7, """
+        Future
+
+        This is a future series of this product/distro in which the developers
+        haven't started working yet.
+        """)
+

=== modified file 'lib/lp/registry/model/distribution.py'
--- lib/lp/registry/model/distribution.py	2009-12-09 14:55:02 +0000
+++ lib/lp/registry/model/distribution.py	2010-01-05 16:22:16 +0000
@@ -84,8 +84,8 @@
     IDistributionSet)
 from lp.registry.interfaces.distributionmirror import (
     IDistributionMirror, MirrorContent, MirrorStatus)
-from lp.registry.interfaces.distroseries import (
-    DistroSeriesStatus, NoSuchDistroSeries)
+from lp.registry.interfaces.series import SeriesStatus
+from lp.registry.interfaces.distroseries import NoSuchDistroSeries
 from canonical.launchpad.interfaces.launchpad import (
     IHasIcon, IHasLogo, IHasMugshot, ILaunchpadCelebrities, ILaunchpadUsage)
 from lp.soyuz.interfaces.queue import PackageUploadStatus
@@ -394,8 +394,9 @@
 
     def newMirror(self, owner, speed, country, content, displayname=None,
                   description=None, http_base_url=None,
-                  ftp_base_url=None, rsync_base_url=None, official_candidate=False,
-                  enabled=False, whiteboard=None):
+                  ftp_base_url=None, rsync_base_url=None,
+                  official_candidate=False, enabled=False,
+                  whiteboard=None):
         """See `IDistribution`."""
         # NB this functionality is only available to distributions that have
         # the full functionality of Launchpad enabled. This is Ubuntu and
@@ -450,15 +451,15 @@
 
         # If we have a frozen one, return that.
         for series in self.series:
-            if series.status == DistroSeriesStatus.FROZEN:
+            if series.status == SeriesStatus.FROZEN:
                 return series
         # If we have one in development, return that.
         for series in self.series:
-            if series.status == DistroSeriesStatus.DEVELOPMENT:
+            if series.status == SeriesStatus.DEVELOPMENT:
                 return series
         # If we have a stable one, return that.
         for series in self.series:
-            if series.status == DistroSeriesStatus.CURRENT:
+            if series.status == SeriesStatus.CURRENT:
                 return series
         # If we have ANY, return the first one.
         if len(self.series) > 0:
@@ -509,7 +510,7 @@
         """See `IDistribution`."""
         return DistroSeries.selectBy(
             distribution=self,
-            status=DistroSeriesStatus.DEVELOPMENT)
+            status=SeriesStatus.DEVELOPMENT)
 
     def getMilestone(self, name):
         """See `IDistribution`."""
@@ -1002,7 +1003,7 @@
         # we're searching for.
         return (
             DistroSeries.distribution == self,
-            DistroSeries.status != DistroSeriesStatus.OBSOLETE,
+            DistroSeries.status != SeriesStatus.OBSOLETE,
             BinaryPackageRelease.binarypackagename == BinaryPackageName.id,
             DistroArchSeries.distroseries == DistroSeries.id,
             Build.distroarchseries == DistroArchSeries.id,
@@ -1482,7 +1483,7 @@
             summary=summary,
             description=description,
             version=version,
-            status=DistroSeriesStatus.EXPERIMENTAL,
+            status=SeriesStatus.EXPERIMENTAL,
             parent_series=parent_series,
             owner=owner)
         if owner.inTeam(self.driver) and not owner.inTeam(self.owner):

=== modified file 'lib/lp/registry/model/distroseries.py'
--- lib/lp/registry/model/distroseries.py	2009-12-22 17:41:46 +0000
+++ lib/lp/registry/model/distroseries.py	2010-01-05 16:22:16 +0000
@@ -95,8 +95,9 @@
 from lp.soyuz.interfaces.buildrecords import IHasBuildRecords
 from lp.soyuz.interfaces.binarypackagename import (
     IBinaryPackageName)
+from lp.registry.interfaces.series import SeriesStatus
 from lp.registry.interfaces.distroseries import (
-    DistroSeriesStatus, IDistroSeries, IDistroSeriesSet, ISeriesMixin)
+    IDistroSeries, IDistroSeriesSet, ISeriesMixin)
 from lp.translations.interfaces.languagepack import LanguagePackType
 from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
 from lp.soyuz.interfaces.queue import PackageUploadStatus
@@ -129,10 +130,10 @@
     @property
     def active(self):
         return self.status in [
-            DistroSeriesStatus.DEVELOPMENT,
-            DistroSeriesStatus.FROZEN,
-            DistroSeriesStatus.CURRENT,
-            DistroSeriesStatus.SUPPORTED
+            SeriesStatus.DEVELOPMENT,
+            SeriesStatus.FROZEN,
+            SeriesStatus.CURRENT,
+            SeriesStatus.SUPPORTED
             ]
 
 
@@ -157,7 +158,7 @@
     description = StringCol(notNull=True)
     version = StringCol(notNull=True)
     status = EnumCol(
-        dbName='releasestatus', notNull=True, schema=DistroSeriesStatus)
+        dbName='releasestatus', notNull=True, schema=SeriesStatus)
     date_created = UtcDateTimeCol(notNull=False, default=UTC_NOW)
     datereleased = UtcDateTimeCol(notNull=False, default=None)
     parent_series =  ForeignKey(
@@ -332,8 +333,8 @@
     @property
     def supported(self):
         return self.status in [
-            DistroSeriesStatus.CURRENT,
-            DistroSeriesStatus.SUPPORTED
+            SeriesStatus.CURRENT,
+            SeriesStatus.SUPPORTED
             ]
 
     @property
@@ -377,12 +378,12 @@
     def canUploadToPocket(self, pocket):
         """See `IDistroSeries`."""
         # Allow everything for distroseries in FROZEN state.
-        if self.status == DistroSeriesStatus.FROZEN:
+        if self.status == SeriesStatus.FROZEN:
             return True
 
         # Define stable/released states.
-        stable_states = (DistroSeriesStatus.SUPPORTED,
-                         DistroSeriesStatus.CURRENT)
+        stable_states = (SeriesStatus.SUPPORTED,
+                         SeriesStatus.CURRENT)
 
         # Deny uploads for RELEASE pocket in stable states.
         if (pocket == PackagePublishingPocket.RELEASE and
@@ -727,14 +728,14 @@
             return
 
         future = [
-            DistroSeriesStatus.EXPERIMENTAL,
-            DistroSeriesStatus.DEVELOPMENT,
-            DistroSeriesStatus.FUTURE,
+            SeriesStatus.EXPERIMENTAL,
+            SeriesStatus.DEVELOPMENT,
+            SeriesStatus.FUTURE,
             ]
         if self.status in future:
             raise TranslationUnavailable(
                 "Translations for this release series are not available yet.")
-        elif self.status == DistroSeriesStatus.OBSOLETE:
+        elif self.status == SeriesStatus.OBSOLETE:
             raise TranslationUnavailable(
                 "This release series is obsolete.  Its translations are no "
                 "longer available.")
@@ -830,9 +831,9 @@
     def isUnstable(self):
         """See `IDistroSeries`."""
         return self.status in [
-            DistroSeriesStatus.FROZEN,
-            DistroSeriesStatus.DEVELOPMENT,
-            DistroSeriesStatus.EXPERIMENTAL,
+            SeriesStatus.FROZEN,
+            SeriesStatus.DEVELOPMENT,
+            SeriesStatus.EXPERIMENTAL,
         ]
 
     def getAllPublishedSources(self):
@@ -1734,7 +1735,7 @@
             return True
 
         # FROZEN state also allow all pockets to be published.
-        if self.status == DistroSeriesStatus.FROZEN:
+        if self.status == SeriesStatus.FROZEN:
             return True
 
         # If we're not republishing, we want to make sure that
@@ -1875,14 +1876,14 @@
             if isreleased:
                 # The query is filtered on released releases.
                 where_clause += "releasestatus in (%s, %s)" % sqlvalues(
-                    DistroSeriesStatus.CURRENT,
-                    DistroSeriesStatus.SUPPORTED)
+                    SeriesStatus.CURRENT,
+                    SeriesStatus.SUPPORTED)
             else:
                 # The query is filtered on unreleased releases.
                 where_clause += "releasestatus in (%s, %s, %s)" % sqlvalues(
-                    DistroSeriesStatus.EXPERIMENTAL,
-                    DistroSeriesStatus.DEVELOPMENT,
-                    DistroSeriesStatus.FROZEN)
+                    SeriesStatus.EXPERIMENTAL,
+                    SeriesStatus.DEVELOPMENT,
+                    SeriesStatus.FROZEN)
         if orderBy is not None:
             return DistroSeries.select(where_clause, orderBy=orderBy)
         else:

=== modified file 'lib/lp/registry/model/productseries.py'
--- lib/lp/registry/model/productseries.py	2009-12-05 18:37:28 +0000
+++ lib/lp/registry/model/productseries.py	2010-01-05 16:22:16 +0000
@@ -50,7 +50,7 @@
 from lp.registry.model.structuralsubscription import (
     StructuralSubscriptionTargetMixin)
 from canonical.launchpad.helpers import shortlist
-from lp.registry.interfaces.distroseries import DistroSeriesStatus
+from lp.registry.interfaces.series import SeriesStatus
 from lp.registry.model.distroseries import SeriesMixin
 from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
 from lp.registry.interfaces.packaging import PackagingType
@@ -89,8 +89,8 @@
 
     product = ForeignKey(dbName='product', foreignKey='Product', notNull=True)
     status = EnumCol(
-        notNull=True, schema=DistroSeriesStatus,
-        default=DistroSeriesStatus.DEVELOPMENT)
+        notNull=True, schema=SeriesStatus,
+        default=SeriesStatus.DEVELOPMENT)
     name = StringCol(notNull=True)
     summary = StringCol(notNull=True)
     datecreated = UtcDateTimeCol(notNull=True, default=UTC_NOW)

=== modified file 'lib/lp/registry/stories/distribution/xx-distribution-packages.txt'
--- lib/lp/registry/stories/distribution/xx-distribution-packages.txt	2009-11-18 02:58:23 +0000
+++ lib/lp/registry/stories/distribution/xx-distribution-packages.txt	2010-01-05 16:22:16 +0000
@@ -124,9 +124,9 @@
     >>> publisher = SoyuzTestPublisher()
     >>> publisher.prepareBreezyAutotest()
     >>> ubuntutest = publisher.ubuntutest
-    >>> from lp.registry.interfaces.distroseries import DistroSeriesStatus
-    >>> ubuntutest['breezy-autotest'].status = DistroSeriesStatus.DEVELOPMENT
-    >>> ubuntutest['hoary-test'].status = DistroSeriesStatus.DEVELOPMENT
+    >>> from lp.registry.interfaces.series import SeriesStatus
+    >>> ubuntutest['breezy-autotest'].status = SeriesStatus.DEVELOPMENT
+    >>> ubuntutest['hoary-test'].status = SeriesStatus.DEVELOPMENT
 
     # Publish the source 'netapplet' in the breezy-autotest and
     #  main archive.

=== modified file 'lib/lp/registry/stories/productseries/xx-productseries-series.txt'
--- lib/lp/registry/stories/productseries/xx-productseries-series.txt	2009-09-18 15:24:30 +0000
+++ lib/lp/registry/stories/productseries/xx-productseries-series.txt	2010-01-05 16:22:16 +0000
@@ -4,14 +4,14 @@
     # There are no obsolete series in the data, create one.
     >>> from zope.component import getUtility
     >>> from lp.registry.interfaces.product import IProductSet
-    >>> from lp.registry.interfaces.distroseries import DistroSeriesStatus
+    >>> from lp.registry.interfaces.series import SeriesStatus
 
     >>> login('[e-mail]')
     >>> productset = getUtility(IProductSet)
     >>> firefox = productset.getByName('firefox')
     >>> series = factory.makeProductSeries(
     ...     name='xxx', product=firefox, summary='Use true GTK UI.')
-    >>> series.status = DistroSeriesStatus.OBSOLETE
+    >>> series.status = SeriesStatus.OBSOLETE
     >>> transaction.commit()
     >>> logout()
 

=== modified file 'lib/lp/registry/tests/test_distribution.py'
--- lib/lp/registry/tests/test_distribution.py	2009-11-07 22:19:06 +0000
+++ lib/lp/registry/tests/test_distribution.py	2010-01-05 16:22:16 +0000
@@ -13,7 +13,7 @@
     TestDistroSeriesCurrentSourceReleases)
 from lp.soyuz.interfaces.distributionsourcepackagerelease import (
     IDistributionSourcePackageRelease)
-from lp.registry.interfaces.distroseries import DistroSeriesStatus
+from lp.registry.interfaces.series import SeriesStatus
 
 
 class TestDistributionCurrentSourceReleases(
@@ -36,7 +36,7 @@
         # version numbers. We don't care whether the version is
         # published in a earlier or later series.
         self.current_series = self.factory.makeDistroRelease(
-            self.distribution, '1.0', status=DistroSeriesStatus.CURRENT)
+            self.distribution, '1.0', status=SeriesStatus.CURRENT)
         self.publisher.getPubSource(
             version='0.9', distroseries=self.current_series)
         self.publisher.getPubSource(

=== modified file 'lib/lp/registry/tests/test_sourcepackage.py'
--- lib/lp/registry/tests/test_sourcepackage.py	2009-09-16 05:59:52 +0000
+++ lib/lp/registry/tests/test_sourcepackage.py	2010-01-05 16:22:16 +0000
@@ -13,7 +13,7 @@
 
 from canonical.launchpad.ftests import login_person, logout
 from lp.registry.interfaces.distribution import NoPartnerArchive
-from lp.registry.interfaces.distroseries import DistroSeriesStatus
+from lp.registry.interfaces.series import SeriesStatus
 from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.soyuz.interfaces.archive import ArchivePurpose
@@ -145,9 +145,9 @@
         # the source package.
         distribution = self.factory.makeDistribution()
         dev_series = self.factory.makeDistroRelease(
-            distribution=distribution, status=DistroSeriesStatus.DEVELOPMENT)
+            distribution=distribution, status=SeriesStatus.DEVELOPMENT)
         other_series = self.factory.makeDistroRelease(
-            distribution=distribution, status=DistroSeriesStatus.OBSOLETE)
+            distribution=distribution, status=SeriesStatus.OBSOLETE)
         self.assertEqual(dev_series, distribution.currentseries)
         dev_sourcepackage = self.factory.makeSourcePackage(
             distroseries=dev_series)

=== modified file 'lib/lp/soyuz/browser/archive.py'
--- lib/lp/soyuz/browser/archive.py	2009-12-14 12:47:54 +0000
+++ lib/lp/soyuz/browser/archive.py	2010-01-05 16:22:16 +0000
@@ -66,7 +66,7 @@
     BuildStatus, BuildSetStatus, IBuildSet)
 from lp.soyuz.interfaces.buildrecords import IHasBuildRecords
 from lp.soyuz.interfaces.component import IComponentSet
-from lp.registry.interfaces.distroseries import DistroSeriesStatus
+from lp.registry.interfaces.series import SeriesStatus
 from canonical.launchpad.interfaces.launchpad import (
     ILaunchpadCelebrities, NotFoundError)
 from lp.soyuz.interfaces.packagecopyrequest import (
@@ -1190,7 +1190,7 @@
         # it will be probably simpler to use the DistroSeries vocabulary
         # and validate the selected value before copying.
         for series in self.context.distribution.series:
-            if series.status == DistroSeriesStatus.OBSOLETE:
+            if series.status == SeriesStatus.OBSOLETE:
                 continue
             terms.append(
                 SimpleTerm(series, str(series.name), series.displayname))

=== modified file 'lib/lp/soyuz/doc/build.txt'
--- lib/lp/soyuz/doc/build.txt	2009-11-24 07:02:21 +0000
+++ lib/lp/soyuz/doc/build.txt	2010-01-05 16:22:16 +0000
@@ -261,12 +261,12 @@
 We will reactivate ubuntu/warty allowing the pmount build to be
 retried.
 
-    >>> from canonical.launchpad.interfaces import DistroSeriesStatus
+    >>> from canonical.launchpad.interfaces import SeriesStatus
     >>> from lp.registry.interfaces.distribution import IDistributionSet
     >>> login('[e-mail]')
     >>> ubuntu = getUtility(IDistributionSet)['ubuntu']
     >>> warty = ubuntu.getSeries('warty')
-    >>> warty.status = DistroSeriesStatus.DEVELOPMENT
+    >>> warty.status = SeriesStatus.DEVELOPMENT
     >>> flush_database_updates()
     >>> login(ANONYMOUS)
 
@@ -333,7 +333,7 @@
 it won't interfere in the next tests.
 
     >>> login('[e-mail]')
-    >>> warty.status = DistroSeriesStatus.SUPPORTED
+    >>> warty.status = SeriesStatus.SUPPORTED
     >>> flush_database_updates()
     >>> login(ANONYMOUS)
 

=== modified file 'lib/lp/soyuz/doc/buildd-slavescanner.txt'
--- lib/lp/soyuz/doc/buildd-slavescanner.txt	2009-12-14 20:36:19 +0000
+++ lib/lp/soyuz/doc/buildd-slavescanner.txt	2010-01-05 16:22:16 +0000
@@ -1381,8 +1381,8 @@
 Change the distroseries status for testing. FROZEN allows building in
 all pockets:
 
-    >>> from canonical.launchpad.interfaces import DistroSeriesStatus
-    >>> hoary_i386.distroseries.status = DistroSeriesStatus.FROZEN
+    >>> from canonical.launchpad.interfaces import SeriesStatus
+    >>> hoary_i386.distroseries.status = SeriesStatus.FROZEN
 
 Now we can start a build in other pockets, and see what archives are
 passed to the slave.

=== modified file 'lib/lp/soyuz/doc/nascentupload-announcements.txt'
--- lib/lp/soyuz/doc/nascentupload-announcements.txt	2009-05-13 14:05:27 +0000
+++ lib/lp/soyuz/doc/nascentupload-announcements.txt	2010-01-05 16:22:16 +0000
@@ -58,11 +58,11 @@
 address and allow uploads to universe:
 
   >>> from canonical.launchpad.interfaces import (
-  ...     DistroSeriesStatus, IComponentSet, IDistributionSet,
+  ...     SeriesStatus, IComponentSet, IDistributionSet,
   ...     ILibraryFileAliasSet)
   >>> ubuntu = getUtility(IDistributionSet)['ubuntu']
   >>> hoary = ubuntu['hoary']
-  >>> hoary.status = DistroSeriesStatus.DEVELOPMENT
+  >>> hoary.status = SeriesStatus.DEVELOPMENT
   >>> hoary.changeslist = "[e-mail]"
   >>> from canonical.launchpad.database import ComponentSelection
   >>> universe = getUtility(IComponentSet)['universe']
@@ -393,7 +393,7 @@
 
 Release hoary, enable uploads to post-release pockets:
 
-  >>> hoary.status = DistroSeriesStatus.CURRENT
+  >>> hoary.status = SeriesStatus.CURRENT
 
 UNAPPROVED source uploads for 'translations' section via insecure:
 
@@ -730,7 +730,7 @@
 Make hoary developmental again, as syncs only happen at that stage of a
 distroseries.
 
-  >>> hoary.status = DistroSeriesStatus.DEVELOPMENT
+  >>> hoary.status = SeriesStatus.DEVELOPMENT
 
   >>> bar_src = NascentUpload(
   ...     datadir(
@@ -779,7 +779,7 @@
 
 Reset hoary back to released and remove disk files created during processing:
 
-  >>> hoary.status = DistroSeriesStatus.CURRENT
+  >>> hoary.status = SeriesStatus.CURRENT
   >>> os.remove(os.path.join(datadir('suite/bar_1.0-5_debian_auto_sync'),
   ...     'bar_1.0.orig.tar.gz'))
   >>> os.remove(os.path.join(datadir('suite/bar_1.0-6'),
@@ -846,7 +846,7 @@
 and binary known in hoary, then our operations in post-release
 pockets can work:
 
-  >>> hoary.status = DistroSeriesStatus.DEVELOPMENT
+  >>> hoary.status = SeriesStatus.DEVELOPMENT
   >>> modified_sync_policy = getPolicy(
   ...     name='sync', distro='ubuntu', distroseries='hoary')
   >>> modified_sync_policy.can_upload_mixed = True
@@ -859,7 +859,7 @@
   >>> result = foo_v1.do_accept()
   >>> foo_v1.queue_root.setAccepted()
   >>> pub_records = foo_v1.queue_root.realiseUpload()
-  >>> hoary.status = DistroSeriesStatus.CURRENT
+  >>> hoary.status = SeriesStatus.CURRENT
 
 Get rid of any emails generated:
 
@@ -975,7 +975,7 @@
 permitted, but converted to ASCII, which is a limitation of the mailer.
 However, UTF-8 in the mail content is preserved.
 
-  >>> hoary.status = DistroSeriesStatus.DEVELOPMENT
+  >>> hoary.status = SeriesStatus.DEVELOPMENT
   >>> anything_policy = getPolicy(
   ...     name='anything', distro='ubuntu', distroseries='hoary')
   >>> bar_upload = NascentUpload(

=== modified file 'lib/lp/soyuz/doc/nascentupload.txt'
--- lib/lp/soyuz/doc/nascentupload.txt	2009-08-28 06:41:25 +0000
+++ lib/lp/soyuz/doc/nascentupload.txt	2010-01-05 16:22:16 +0000
@@ -18,11 +18,11 @@
 "launchpad" to handle this.
 
   >>> from canonical.launchpad.interfaces import (
-  ...     DistroSeriesStatus, IComponentSet, IDistributionSet)
+  ...     SeriesStatus, IComponentSet, IDistributionSet)
   >>> from canonical.launchpad.database import ComponentSelection
   >>> ubuntu = getUtility(IDistributionSet)['ubuntu']
   >>> hoary = ubuntu['hoary']
-  >>> hoary.status = DistroSeriesStatus.DEVELOPMENT
+  >>> hoary.status = SeriesStatus.DEVELOPMENT
   >>> universe = getUtility(IComponentSet)['universe']
   >>> from canonical.testing import LaunchpadZopelessLayer
   >>> from canonical.database.sqlbase import commit
@@ -717,7 +717,7 @@
 to upload to -UPDATES in a DEVELOPMENT series.
 
   >>> LaunchpadZopelessLayer.switchDbUser('launchpad')
-  >>> hoary.status = DistroSeriesStatus.CURRENT
+  >>> hoary.status = SeriesStatus.CURRENT
   >>> commit()
   >>> LaunchpadZopelessLayer.switchDbUser('uploader')
 
@@ -749,7 +749,7 @@
 And pop it back to development now that we're done
 
   >>> LaunchpadZopelessLayer.switchDbUser('launchpad')
-  >>> hoary.status = DistroSeriesStatus.DEVELOPMENT
+  >>> hoary.status = SeriesStatus.DEVELOPMENT
   >>> commit()
   >>> LaunchpadZopelessLayer.switchDbUser('uploader')
 

=== modified file 'lib/lp/soyuz/doc/package-diff.txt'
--- lib/lp/soyuz/doc/package-diff.txt	2009-09-23 12:02:35 +0000
+++ lib/lp/soyuz/doc/package-diff.txt	2010-01-05 16:22:16 +0000
@@ -172,8 +172,8 @@
 We will release ubuntu/hoary so we can upload to post-RELEASE pockets
 and ubuntu/breezy-autotest.
 
-    >>> from canonical.launchpad.interfaces import DistroSeriesStatus
-    >>> hoary.status = DistroSeriesStatus.CURRENT
+    >>> from canonical.launchpad.interfaces import SeriesStatus
+    >>> hoary.status = SeriesStatus.CURRENT
 
 We upload version '1.0-9' to hoary-updates and get the diff against
 the last published version in the RELEASE pocket.

=== modified file 'lib/lp/soyuz/doc/soyuz-set-of-uploads.txt'
--- lib/lp/soyuz/doc/soyuz-set-of-uploads.txt	2009-10-26 18:40:04 +0000
+++ lib/lp/soyuz/doc/soyuz-set-of-uploads.txt	2010-01-05 16:22:16 +0000
@@ -502,8 +502,8 @@
 Set ubuntutest/breezy as the "current series" to activate post-release
 pockets.
 
-  >>> from canonical.launchpad.interfaces import DistroSeriesStatus
-  >>> breezy.status = DistroSeriesStatus.CURRENT
+  >>> from canonical.launchpad.interfaces import SeriesStatus
+  >>> breezy.status = SeriesStatus.CURRENT
   >>> LaunchpadZopelessLayer.txn.commit()
 
 Since we are using 'sync' policy in the following tests the packages
@@ -599,7 +599,7 @@
 Set ubuntutest/breezy to 'experimental' state again to not affect the
 rest of the test:
 
-  >>> breezy.status = DistroSeriesStatus.EXPERIMENTAL
+  >>> breezy.status = SeriesStatus.EXPERIMENTAL
   >>> breezy.syncUpdate()
 
 

=== modified file 'lib/lp/soyuz/doc/uploadpolicy.txt'
--- lib/lp/soyuz/doc/uploadpolicy.txt	2009-05-13 14:05:27 +0000
+++ lib/lp/soyuz/doc/uploadpolicy.txt	2010-01-05 16:22:16 +0000
@@ -78,7 +78,7 @@
 instead of UNAPPROVED)
 
   >>> from canonical.launchpad.interfaces import (
-  ...     DistroSeriesStatus, IDistributionSet)
+  ...     SeriesStatus, IDistributionSet)
   >>> ubuntu = getUtility(IDistributionSet)['ubuntu']
   >>> hoary = ubuntu['hoary']
 
@@ -102,7 +102,7 @@
 When the distroseries is FROZEN the uploads should wait in UNAPPROVED queue:
 
   >>> login('[e-mail]')
-  >>> hoary.status = DistroSeriesStatus.FROZEN
+  >>> hoary.status = SeriesStatus.FROZEN
   >>> from canonical.database.sqlbase import flush_database_updates
   >>> flush_database_updates()
 

=== modified file 'lib/lp/soyuz/scripts/buildd.py'
--- lib/lp/soyuz/scripts/buildd.py	2009-10-26 18:40:04 +0000
+++ lib/lp/soyuz/scripts/buildd.py	2010-01-05 16:22:16 +0000
@@ -21,7 +21,7 @@
 from lp.services.scripts.base import (
     LaunchpadCronScript, LaunchpadScriptFailure)
 from lp.registry.interfaces.distribution import IDistributionSet
-from lp.registry.interfaces.distroseries import DistroSeriesStatus
+from lp.registry.interfaces.series import SeriesStatus
 
 # XXX cprov 2009-04-16: This function should live in
 # lp.registry.interfaces.distroseries. It cannot be done right now
@@ -159,7 +159,7 @@
         # Iterate over all supported distroarchseries with available chroot.
         build_set = getUtility(IBuildSet)
         for distroseries in distribution:
-            if distroseries.status == DistroSeriesStatus.OBSOLETE:
+            if distroseries.status == SeriesStatus.OBSOLETE:
                 self.logger.debug(
                     "Skipping obsolete distroseries: %s" % distroseries.title)
                 continue

=== modified file 'lib/lp/soyuz/scripts/ftpmaster.py'
--- lib/lp/soyuz/scripts/ftpmaster.py	2009-12-10 11:42:07 +0000
+++ lib/lp/soyuz/scripts/ftpmaster.py	2010-01-05 16:22:16 +0000
@@ -37,7 +37,7 @@
 from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
 from canonical.launchpad.webapp.interfaces import NotFoundError
 from lp.registry.interfaces.distribution import IDistributionSet
-from lp.registry.interfaces.distroseries import DistroSeriesStatus
+from lp.registry.interfaces.series import SeriesStatus
 from lp.registry.interfaces.person import IPersonSet
 from lp.registry.interfaces.pocket import (
     PackagePublishingPocket, pocketsuffix)
@@ -1064,7 +1064,7 @@
         """
         self.checkNoSuiteDefined()
         try:
-            series = self.getSeriesByStatus(DistroSeriesStatus.CURRENT)
+            series = self.getSeriesByStatus(SeriesStatus.CURRENT)
         except NotFoundError, err:
             raise LaunchpadScriptFailure(err)
 
@@ -1087,8 +1087,8 @@
         """
         self.checkNoSuiteDefined()
         series = None
-        wanted_status = (DistroSeriesStatus.DEVELOPMENT,
-                         DistroSeriesStatus.FROZEN)
+        wanted_status = (SeriesStatus.DEVELOPMENT,
+                         SeriesStatus.FROZEN)
         for status in wanted_status:
             try:
                 series = self.getSeriesByStatus(status)
@@ -1118,8 +1118,8 @@
         """
         self.checkNoSuiteDefined()
         supported_series = []
-        unsupported_status = (DistroSeriesStatus.EXPERIMENTAL,
-                              DistroSeriesStatus.OBSOLETE)
+        unsupported_status = (SeriesStatus.EXPERIMENTAL,
+                              SeriesStatus.OBSOLETE)
         for distroseries in self.location.distribution:
             if distroseries.status not in unsupported_status:
                 supported_series.append(distroseries.name)
@@ -1361,7 +1361,7 @@
                 "and which is not the most recent distroseries.")
 
         # Is the distroseries in an obsolete state?  Bail out now if not.
-        if distroseries.status != DistroSeriesStatus.OBSOLETE:
+        if distroseries.status != SeriesStatus.OBSOLETE:
             raise SoyuzScriptError(
                 "%s is not at status OBSOLETE." % distroseries.name)
 

=== modified file 'lib/lp/soyuz/scripts/tests/test_copypackage.py'
--- lib/lp/soyuz/scripts/tests/test_copypackage.py	2009-12-21 12:54:47 +0000
+++ lib/lp/soyuz/scripts/tests/test_copypackage.py	2010-01-05 16:22:16 +0000
@@ -23,7 +23,7 @@
     CreateBugParams, IBugSet)
 from lp.bugs.interfaces.bugtask import BugTaskStatus
 from lp.registry.interfaces.distribution import IDistributionSet
-from lp.registry.interfaces.distroseries import DistroSeriesStatus
+from lp.registry.interfaces.series import SeriesStatus
 from lp.registry.interfaces.person import IPersonSet
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.soyuz.adapters.packagelocation import PackageLocationError
@@ -947,7 +947,7 @@
         # Make ubuntutest/breezy-autotest CURRENT so uploads to SECURITY
         # pocket can be accepted.
         self.test_publisher.breezy_autotest.status = (
-            DistroSeriesStatus.CURRENT)
+            SeriesStatus.CURRENT)
 
     def createDelayedCopyContext(self):
         """Create a context to allow delayed-copies test.

=== modified file 'lib/lp/soyuz/scripts/tests/test_lpquerydistro.py'
--- lib/lp/soyuz/scripts/tests/test_lpquerydistro.py	2009-06-25 04:06:00 +0000
+++ lib/lp/soyuz/scripts/tests/test_lpquerydistro.py	2010-01-05 16:22:16 +0000
@@ -15,7 +15,7 @@
 from canonical.database.sqlbase import flush_database_updates
 from canonical.testing import LaunchpadLayer
 from lp.registry.interfaces.distribution import IDistributionSet
-from lp.registry.interfaces.distroseries import DistroSeriesStatus
+from lp.registry.interfaces.series import SeriesStatus
 from lp.services.scripts.base import LaunchpadScriptFailure
 from lp.soyuz.scripts.ftpmaster import LpQueryDistro
 from canonical.testing import LaunchpadZopelessLayer
@@ -156,7 +156,7 @@
         self.assertEqual(helper.location.distribution.name, u'ubuntu')
         self.assertEqual(self.test_output, u'hoary')
 
-        hoary.status = DistroSeriesStatus.FROZEN
+        hoary.status = SeriesStatus.FROZEN
         flush_database_updates()
 
         helper = self.getLpQueryDistro(test_args=['development'])

=== modified file 'lib/lp/soyuz/scripts/tests/test_obsoletedistroseries.py'
--- lib/lp/soyuz/scripts/tests/test_obsoletedistroseries.py	2009-06-25 04:06:00 +0000
+++ lib/lp/soyuz/scripts/tests/test_obsoletedistroseries.py	2010-01-05 16:22:16 +0000
@@ -21,7 +21,7 @@
     SecureSourcePackagePublishingHistory,
     SourcePackagePublishingHistory)
 from lp.registry.interfaces.distribution import IDistributionSet
-from lp.registry.interfaces.distroseries import DistroSeriesStatus
+from lp.registry.interfaces.series import SeriesStatus
 from lp.soyuz.interfaces.publishing import PackagePublishingStatus
 from canonical.testing import LaunchpadZopelessLayer
 
@@ -132,7 +132,7 @@
     def testNothingToDoCase(self):
         """When there is nothing to do, we expect an exception."""
         obsoleter = self.getObsoleter()
-        self.warty.status = DistroSeriesStatus.OBSOLETE
+        self.warty.status = SeriesStatus.OBSOLETE
 
         # Get all the published sources in warty.
         published_sources, published_binaries = (
@@ -151,7 +151,7 @@
     def testObsoleteDistroseriesWorks(self):
         """Make sure the required publications are obsoleted."""
         obsoleter = self.getObsoleter()
-        self.warty.status = DistroSeriesStatus.OBSOLETE
+        self.warty.status = SeriesStatus.OBSOLETE
 
         # Get all the published sources in warty.
         published_sources, published_binaries = (

=== modified file 'lib/lp/soyuz/scripts/tests/test_queue.py'
--- lib/lp/soyuz/scripts/tests/test_queue.py	2009-08-28 07:34:44 +0000
+++ lib/lp/soyuz/scripts/tests/test_queue.py	2010-01-05 16:22:16 +0000
@@ -28,7 +28,7 @@
 from lp.bugs.interfaces.bugtask import IBugTaskSet
 from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
 from lp.registry.interfaces.distribution import IDistributionSet
-from lp.registry.interfaces.distroseries import DistroSeriesStatus
+from lp.registry.interfaces.series import SeriesStatus
 from lp.registry.interfaces.person import IPersonSet
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.soyuz.interfaces.archive import ArchivePurpose, IArchiveSet
@@ -474,7 +474,7 @@
         # to BACKPORTS.
         breezy_autotest = getUtility(
             IDistributionSet)['ubuntu']['breezy-autotest']
-        breezy_autotest.status = DistroSeriesStatus.CURRENT
+        breezy_autotest.status = SeriesStatus.CURRENT
 
         LaunchpadZopelessLayer.txn.commit()
         LaunchpadZopelessLayer.switchDbUser(self.dbuser)
@@ -522,7 +522,7 @@
         # to PROPOSED.
         breezy_autotest = getUtility(
             IDistributionSet)['ubuntu']['breezy-autotest']
-        breezy_autotest.status = DistroSeriesStatus.CURRENT
+        breezy_autotest.status = SeriesStatus.CURRENT
 
         LaunchpadZopelessLayer.txn.commit()
         LaunchpadZopelessLayer.switchDbUser(self.dbuser)

=== modified file 'lib/lp/soyuz/tests/test_packageset.py'
--- lib/lp/soyuz/tests/test_packageset.py	2009-10-29 14:12:58 +0000
+++ lib/lp/soyuz/tests/test_packageset.py	2010-01-05 16:22:16 +0000
@@ -9,7 +9,7 @@
 
 from lp.testing import TestCaseWithFactory
 from lp.registry.interfaces.distribution import IDistributionSet
-from lp.registry.interfaces.distroseries import DistroSeriesStatus
+from lp.registry.interfaces.series import SeriesStatus
 from lp.soyuz.interfaces.packageset import (
     DuplicatePackagesetName, IPackagesetSet)
 
@@ -26,7 +26,7 @@
         self.distroseries_current = self.distribution.currentseries
         self.distroseries_experimental = self.factory.makeDistroRelease(
             distribution = self.distribution, name="experimental",
-            status=DistroSeriesStatus.EXPERIMENTAL)
+            status=SeriesStatus.EXPERIMENTAL)
 
         self.person1 = self.factory.makePerson(
             name='hacker', displayname=u'Happy Hacker')
@@ -133,10 +133,10 @@
         self.distroseries_current = self.distribution.currentseries
         self.distroseries_experimental = self.factory.makeDistroRelease(
             distribution = self.distribution, name="experimental",
-            status=DistroSeriesStatus.EXPERIMENTAL)
+            status=SeriesStatus.EXPERIMENTAL)
         self.distroseries_experimental2 = self.factory.makeDistroRelease(
             distribution = self.distribution, name="experimental2",
-            status=DistroSeriesStatus.EXPERIMENTAL)
+            status=SeriesStatus.EXPERIMENTAL)
 
         self.person1 = self.factory.makePerson(
             name='hacker', displayname=u'Happy Hacker')

=== modified file 'lib/lp/soyuz/tests/test_packageupload.py'
--- lib/lp/soyuz/tests/test_packageupload.py	2009-12-07 13:45:31 +0000
+++ lib/lp/soyuz/tests/test_packageupload.py	2010-01-05 16:22:16 +0000
@@ -15,7 +15,7 @@
 from email import message_from_string
 from lp.archiveuploader.tests import datadir
 from lp.registry.interfaces.distribution import IDistributionSet
-from lp.registry.interfaces.distroseries import DistroSeriesStatus
+from lp.registry.interfaces.series import SeriesStatus
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.services.mail import stub
 from lp.soyuz.interfaces.archive import ArchivePurpose
@@ -180,7 +180,7 @@
         # Release ubuntutest/breezy-autotest, so delayed-copies to
         # SECURITY pocket can be accepted.
         self.test_publisher.breezy_autotest.status = (
-            DistroSeriesStatus.CURRENT)
+            SeriesStatus.CURRENT)
 
         # Create an ancestry publication in 'multiverse'.
         ancestry_source = self.test_publisher.getPubSource(
@@ -281,7 +281,7 @@
         # Create the default delayed-copy context.
         delayed_copy = self.createDelayedCopy(source_only=True)
         self.test_publisher.breezy_autotest.status = (
-            DistroSeriesStatus.CURRENT)
+            SeriesStatus.CURRENT)
         self.layer.txn.commit()
 
         # Accept and publish the delayed-copy.

=== modified file 'lib/lp/soyuz/tests/test_publishing_top_level_api.py'
--- lib/lp/soyuz/tests/test_publishing_top_level_api.py	2009-08-28 07:34:44 +0000
+++ lib/lp/soyuz/tests/test_publishing_top_level_api.py	2010-01-05 16:22:16 +0000
@@ -7,7 +7,7 @@
 
 from lp.soyuz.tests.test_publishing import TestNativePublishingBase
 
-from lp.registry.interfaces.distroseries import DistroSeriesStatus
+from lp.registry.interfaces.series import SeriesStatus
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.soyuz.interfaces.publishing import PackagePublishingStatus
 
@@ -167,7 +167,7 @@
         Publication to UPDATES pocket (post-release pockets) are ignored
         """
         self.assertEqual(
-            self.breezy_autotest.status, DistroSeriesStatus.EXPERIMENTAL)
+            self.breezy_autotest.status, SeriesStatus.EXPERIMENTAL)
         self.assertEqual(self.breezy_autotest.isUnstable(), True)
         self.checkPublicationsAreConsidered(PackagePublishingPocket.RELEASE)
         self.checkPublicationsAreIgnored(PackagePublishingPocket.UPDATES)
@@ -179,11 +179,11 @@
         Publications to UPDATES pocket are considered.
         """
         # Release ubuntu/breezy-autotest.
-        self.breezy_autotest.status = DistroSeriesStatus.CURRENT
+        self.breezy_autotest.status = SeriesStatus.CURRENT
         self.layer.commit()
 
         self.assertEqual(
-            self.breezy_autotest.status, DistroSeriesStatus.CURRENT)
+            self.breezy_autotest.status, SeriesStatus.CURRENT)
         self.assertEqual(self.breezy_autotest.isUnstable(), False)
         self.checkPublicationsAreConsidered(PackagePublishingPocket.UPDATES)
         self.checkPublicationsAreIgnored(PackagePublishingPocket.RELEASE)
@@ -194,11 +194,11 @@
         Publications to both, RELEASE and UPDATES, pockets are considered.
         """
         # Release ubuntu/breezy-autotest.
-        self.breezy_autotest.status = DistroSeriesStatus.FROZEN
+        self.breezy_autotest.status = SeriesStatus.FROZEN
         self.layer.commit()
 
         self.assertEqual(
-            self.breezy_autotest.status, DistroSeriesStatus.FROZEN)
+            self.breezy_autotest.status, SeriesStatus.FROZEN)
         self.assertEqual(
             self.breezy_autotest.isUnstable(), True)
         self.checkPublicationsAreConsidered(PackagePublishingPocket.UPDATES)
@@ -249,7 +249,7 @@
             self._createDefaulSourcePublications())
 
         # Release 'breezy-autotest'.
-        self.breezy_autotest.status = DistroSeriesStatus.CURRENT
+        self.breezy_autotest.status = SeriesStatus.CURRENT
         self.layer.commit()
 
         # Since the distroseries is stable, nothing is returned because
@@ -282,7 +282,7 @@
         pub_pending_release, pub_published_release, pub_pending_updates = (
             self._createDefaulSourcePublications())
         # Freeze 'breezy-autotest'.
-        self.breezy_autotest.status = DistroSeriesStatus.FROZEN
+        self.breezy_autotest.status = SeriesStatus.FROZEN
         self.layer.commit()
 
         # Usual publication procedure for a distroseries in development
@@ -361,7 +361,7 @@
             self._createDefaulBinaryPublications())
 
         # Release 'breezy-autotest'
-        self.breezy_autotest.status = DistroSeriesStatus.CURRENT
+        self.breezy_autotest.status = SeriesStatus.CURRENT
         self.layer.commit()
 
         # Since the distroseries is stable, nothing is returned because
@@ -394,7 +394,7 @@
         pub_pending_release, pub_published_release, pub_pending_updates = (
             self._createDefaulBinaryPublications())
         # Freeze 'breezy-autotest'
-        self.breezy_autotest.status = DistroSeriesStatus.FROZEN
+        self.breezy_autotest.status = SeriesStatus.FROZEN
         self.layer.commit()
 
         # Usual publication procedure for a distroseries in development

=== modified file 'lib/lp/testing/factory.py'
--- lib/lp/testing/factory.py	2010-01-05 00:53:47 +0000
+++ lib/lp/testing/factory.py	2010-01-05 16:22:16 +0000
@@ -14,11 +14,11 @@
     ]
 
 from datetime import datetime, timedelta
-from email.Encoders import encode_base64
-from email.Utils import make_msgid, formatdate
-from email.Message import Message as EmailMessage
-from email.MIMEText import MIMEText
-from email.MIMEMultipart import MIMEMultipart
+from email.encoders import encode_base64
+from email.utils import make_msgid, formatdate
+from email.message import Message as EmailMessage
+from email.mime.text import MIMEText
+from email.mime.multipart import MIMEMultipart
 from itertools import count
 from StringIO import StringIO
 import os.path
@@ -100,8 +100,8 @@
 from lp.registry.model.milestone import Milestone
 from lp.registry.model.suitesourcepackage import SuiteSourcePackage
 from lp.registry.interfaces.distribution import IDistributionSet
-from lp.registry.interfaces.distroseries import (
-    DistroSeriesStatus, IDistroSeries)
+from lp.registry.interfaces.series import SeriesStatus
+from lp.registry.interfaces.distroseries import IDistroSeries
 from lp.registry.interfaces.gpg import GPGKeyAlgorithm, IGPGKeySet
 from lp.registry.interfaces.mailinglist import (
     IMailingListSet, MailingListStatus)
@@ -511,7 +511,8 @@
             group = self.makeTranslationGroup()
         if person is None:
             person = self.makePerson()
-        ITranslationsPerson(person).translations_relicensing_agreement = license
+        ITranslationsPerson(person).translations_relicensing_agreement = (
+            license)
         return getUtility(ITranslatorSet).new(group, language, person)
 
     def makeMilestone(
@@ -1442,7 +1443,7 @@
             members, owner)
 
     def makeDistroRelease(self, distribution=None, version=None,
-                          status=DistroSeriesStatus.DEVELOPMENT,
+                          status=SeriesStatus.DEVELOPMENT,
                           parent_series=None, name=None):
         """Make a new distro release."""
         if distribution is None:

=== modified file 'lib/lp/translations/browser/distribution.py'
--- lib/lp/translations/browser/distribution.py	2009-10-26 18:40:04 +0000
+++ lib/lp/translations/browser/distribution.py	2010-01-05 16:22:16 +0000
@@ -19,7 +19,7 @@
     LaunchpadView, Link)
 from canonical.launchpad.webapp.menu import NavigationMenu
 from lp.registry.interfaces.distribution import IDistribution
-from lp.registry.interfaces.distroseries import DistroSeriesStatus
+from lp.registry.interfaces.series import SeriesStatus
 from lp.registry.browser.distribution import DistributionEditView
 from lp.translations.browser.translations import TranslationsMixin
 
@@ -100,7 +100,7 @@
         series = [
             series
             for series in self.context.series
-            if (series.status != DistroSeriesStatus.OBSOLETE
+            if (series.status != SeriesStatus.OBSOLETE
                 and (self.translation_focus is None or
                      self.translation_focus.id != series.id))
             ]

=== modified file 'lib/lp/translations/browser/tests/distroseries-views.txt'
--- lib/lp/translations/browser/tests/distroseries-views.txt	2009-07-16 14:40:28 +0000
+++ lib/lp/translations/browser/tests/distroseries-views.txt	2010-01-05 16:22:16 +0000
@@ -5,7 +5,7 @@
 Let's use ubuntu/hoary for these tests.
 
     >>> from canonical.launchpad.interfaces import IDistributionSet
-    >>> from lp.registry.interfaces.distroseries import DistroSeriesStatus
+    >>> from lp.registry.interfaces.series import SeriesStatus
     >>> ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
     >>> hoary = ubuntu.getSeries('hoary')
 
@@ -13,7 +13,7 @@
 message.
 
     >>> login('[e-mail]')
-    >>> hoary.status = DistroSeriesStatus.CURRENT
+    >>> hoary.status = SeriesStatus.CURRENT
 
 == Hiding translations ==
 

=== modified file 'lib/lp/translations/model/translationimportqueue.py'
--- lib/lp/translations/model/translationimportqueue.py	2009-12-24 11:34:12 +0000
+++ lib/lp/translations/model/translationimportqueue.py	2010-01-05 16:22:16 +0000
@@ -36,8 +36,8 @@
 from canonical.launchpad.interfaces.lpstorm import IMasterStore
 from canonical.launchpad.webapp.interfaces import NotFoundError
 from lp.registry.interfaces.distribution import IDistribution
-from lp.registry.interfaces.distroseries import (
-    IDistroSeries, DistroSeriesStatus)
+from lp.registry.interfaces.series import SeriesStatus
+from lp.registry.interfaces.distroseries import IDistroSeries
 from lp.registry.interfaces.person import (
     IPerson, validate_person_not_private_membership)
 from lp.registry.interfaces.product import IProduct
@@ -1284,7 +1284,7 @@
                     Distribution.id = DistroSeries.distribution
                 WHERE DistroSeries.releasestatus = %s
                 LIMIT 100)
-            """ % quote(DistroSeriesStatus.OBSOLETE))
+            """ % quote(SeriesStatus.OBSOLETE))
         return cur.rowcount
 
     def cleanUpQueue(self):

=== modified file 'lib/lp/translations/scripts/remove_obsolete_translations.py'
--- lib/lp/translations/scripts/remove_obsolete_translations.py	2009-07-17 00:26:05 +0000
+++ lib/lp/translations/scripts/remove_obsolete_translations.py	2010-01-05 16:22:16 +0000
@@ -10,7 +10,7 @@
 
 from canonical.database.sqlbase import quote
 
-from lp.registry.interfaces.distroseries import DistroSeriesStatus
+from lp.registry.interfaces.series import SeriesStatus
 from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
 from canonical.launchpad.interfaces.looptuner import ITunableLoop
 
@@ -174,7 +174,7 @@
                      ON POTemplate.distroseries=DistroSeries.id
                    WHERE DistroSeries.releasestatus=%s AND
                          DistroSeries.distribution=%s""" % (
-            quote(DistroSeriesStatus.OBSOLETE),
+            quote(SeriesStatus.OBSOLETE),
             quote(getUtility(ILaunchpadCelebrities).ubuntu))
         result = self.store.execute(query)
         count = result.get_one()
@@ -200,7 +200,7 @@
                      WHERE DistroSeries.releasestatus != %s
                      GROUP BY DistroSeries.id
                      ORDER BY DistroSeries.id""" % quote(
-            DistroSeriesStatus.OBSOLETE)
+            SeriesStatus.OBSOLETE)
         result = self.store.execute(query)
         return result.get_all()
 
@@ -216,7 +216,7 @@
                            productseries IS NOT NULL
                      GROUP BY POTemplate.id
                      ORDER BY POTemplate.id""" % quote(
-            DistroSeriesStatus.OBSOLETE)
+            SeriesStatus.OBSOLETE)
         result = self.store.execute(query)
         return result.get_all()
 
@@ -232,7 +232,7 @@
                            productseries IS NOT NULL
                      GROUP BY POTemplate.id
                      ORDER BY POTemplate.id""" % quote(
-            DistroSeriesStatus.OBSOLETE)
+            SeriesStatus.OBSOLETE)
         result = self.store.execute(query)
         return result.get_all()
 
@@ -250,7 +250,7 @@
                            productseries IS NOT NULL
                      GROUP BY POFile.id
                      ORDER BY POFile.id""" % quote(
-            DistroSeriesStatus.OBSOLETE)
+            SeriesStatus.OBSOLETE)
         result = self.store.execute(query)
         return result.get_all()
 
@@ -316,7 +316,7 @@
                   'join_column' : 'distroseries',
                   'distribution' :
                     quote(getUtility(ILaunchpadCelebrities).ubuntu),
-                  'releasestatus' : quote(DistroSeriesStatus.OBSOLETE),
+                  'releasestatus' : quote(SeriesStatus.OBSOLETE),
                   'collection_sql' : collect_obsolete_potemplates_query,
                   },
             }

=== modified file 'lib/lp/translations/templates/pofile-details.pt'
--- lib/lp/translations/templates/pofile-details.pt	2009-12-13 08:28:51 +0000
+++ lib/lp/translations/templates/pofile-details.pt	2010-01-05 16:22:16 +0000
@@ -42,12 +42,10 @@
 
         <ul tal:condition="view/contributors">
           <li tal:repeat="contributor view/contributors">
-            <tal:not-merged condition="not: contributor/merged">
-              <a tal:replace="structure contributor/fmt:link" />
-              (<a tal:attributes="
-                 href string:${context/fmt:url}/+filter?person=${contributor/name}"
-                >filter</a>)
-            </tal:not-merged>
+            <a tal:replace="structure contributor/fmt:link" />
+            (<a tal:attributes="
+               href string:${context/fmt:url}/+filter?person=${contributor/name}"
+              >filter</a>)
           </li>
         </ul>
 

=== modified file 'lib/lp/translations/tests/test_autoapproval.py'
--- lib/lp/translations/tests/test_autoapproval.py	2009-12-18 09:25:14 +0000
+++ lib/lp/translations/tests/test_autoapproval.py	2010-01-05 16:22:16 +0000
@@ -18,7 +18,7 @@
 from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
 from canonical.launchpad.interfaces.lpstorm import IMasterStore
 
-from lp.registry.interfaces.distroseries import DistroSeriesStatus
+from lp.registry.interfaces.series import SeriesStatus
 from lp.registry.model.distribution import Distribution
 from lp.registry.model.sourcepackagename import (
     SourcePackageName,
@@ -820,7 +820,7 @@
         self.queue._cleanUpObsoleteDistroEntries(self.store)
         self.assertTrue(self._exists(entry_id))
 
-        entry.distroseries.status = DistroSeriesStatus.OBSOLETE
+        entry.distroseries.status = SeriesStatus.OBSOLETE
         entry.distroseries.syncUpdate()
 
         become_the_gardener(self.layer)