Merge lp:~jelmer/launchpad/buildmaster-enums into lp:launchpad

[Jelmer Vernooij]

Move enums in buildmaster to lp.buildmaster.

Some trivial refactoring.

Move enums inside of the buildd manager to lp.buildmaster.enums. Remove the remainder of lib/lp/buildmanager/interfaces/buildbase.py

[Brad Crittenden (bac)]

Nice, big, boring branch Jelmer. Thanks for doing it.

We talked about the local import. Fix it if you can with minimal fuss.

Also, many place you have:

+from lp.buildmaster.enums import (
+ BuildStatus,
+ BuildFarmJobType,
+ )

which needs to be reordered for proper alphabetizing.

review: Approve (code)

=== modified file 'lib/canonical/launchpad/doc/tales.txt'
--- lib/canonical/launchpad/doc/tales.txt	2010-08-24 11:31:13 +0000
+++ lib/canonical/launchpad/doc/tales.txt	2010-08-30 02:12:47 +0000
@@ -197,7 +197,7 @@
 
 The 'building' build is 14x14:
 
-    >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
+    >>> from lp.buildmaster.enums import BuildStatus
     >>> from zope.security.proxy import removeSecurityProxy
     >>> removeSecurityProxy(build).status = BuildStatus.BUILDING
     >>> print test_tales("build/image:icon", build=build)

=== modified file 'lib/canonical/launchpad/interfaces/_schema_circular_imports.py'
--- lib/canonical/launchpad/interfaces/_schema_circular_imports.py	2010-08-24 15:29:01 +0000
+++ lib/canonical/launchpad/interfaces/_schema_circular_imports.py	2010-08-30 02:12:47 +0000
@@ -47,7 +47,7 @@
 from lp.bugs.interfaces.bugtask import IBugTask
 from lp.bugs.interfaces.bugtracker import IBugTracker
 from lp.bugs.interfaces.bugwatch import IBugWatch
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
 from lp.buildmaster.interfaces.buildfarmjob import IBuildFarmJob
 from lp.buildmaster.interfaces.buildqueue import IBuildQueue
 from lp.code.interfaces.branch import IBranch

=== modified file 'lib/canonical/launchpad/webapp/tales.py'
--- lib/canonical/launchpad/webapp/tales.py	2010-08-23 16:51:11 +0000
+++ lib/canonical/launchpad/webapp/tales.py	2010-08-30 02:12:47 +0000
@@ -58,7 +58,7 @@
 from canonical.lazr.canonicalurl import nearest_adapter
 from lp.app.browser.stringformatter import escape, FormattersAPI
 from lp.blueprints.interfaces.specification import ISpecification
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
 from lp.code.interfaces.branch import IBranch
 from lp.soyuz.enums import ArchivePurpose
 from lp.soyuz.interfaces.archive import IPPA

=== modified file 'lib/lp/archiveuploader/dscfile.py'
--- lib/lp/archiveuploader/dscfile.py	2010-08-25 11:01:59 +0000
+++ lib/lp/archiveuploader/dscfile.py	2010-08-30 02:12:47 +0000
@@ -58,7 +58,7 @@
     re_valid_version,
     safe_fix_maintainer,
     )
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
 from lp.code.interfaces.sourcepackagerecipebuild import (
     ISourcePackageRecipeBuildSource,
     )

=== modified file 'lib/lp/archiveuploader/nascentuploadfile.py'
--- lib/lp/archiveuploader/nascentuploadfile.py	2010-08-26 08:02:08 +0000
+++ lib/lp/archiveuploader/nascentuploadfile.py	2010-08-30 02:12:47 +0000
@@ -44,7 +44,7 @@
     re_valid_pkg_name,
     re_valid_version,
     )
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
 from lp.soyuz.enums import (
     BinaryPackageFormat,
     PackagePublishingPriority,

=== modified file 'lib/lp/archiveuploader/tests/test_recipeuploads.py'
--- lib/lp/archiveuploader/tests/test_recipeuploads.py	2010-08-24 12:25:48 +0000
+++ lib/lp/archiveuploader/tests/test_recipeuploads.py	2010-08-30 02:12:47 +0000
@@ -13,7 +13,7 @@
 from lp.archiveuploader.tests.test_uploadprocessor import (
     TestUploadProcessorBase,
     )
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
 from lp.code.interfaces.sourcepackagerecipebuild import (
     ISourcePackageRecipeBuildSource,
     )

=== modified file 'lib/lp/archiveuploader/tests/test_uploadprocessor.py'
--- lib/lp/archiveuploader/tests/test_uploadprocessor.py	2010-08-24 13:56:22 +0000
+++ lib/lp/archiveuploader/tests/test_uploadprocessor.py	2010-08-30 02:12:47 +0000
@@ -41,7 +41,7 @@
     parse_build_upload_leaf_name,
     UploadProcessor,
     )
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
 from lp.registry.interfaces.distribution import IDistributionSet
 from lp.registry.interfaces.person import IPersonSet
 from lp.registry.interfaces.pocket import PackagePublishingPocket

=== modified file 'lib/lp/archiveuploader/uploadprocessor.py'
--- lib/lp/archiveuploader/uploadprocessor.py	2010-08-20 20:31:18 +0000
+++ lib/lp/archiveuploader/uploadprocessor.py	2010-08-30 02:12:47 +0000
@@ -74,7 +74,7 @@
     SOURCE_PACKAGE_RECIPE_UPLOAD_POLICY_NAME,
     UploadPolicyError,
     )
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
 from lp.registry.interfaces.distribution import IDistributionSet
 from lp.registry.interfaces.person import IPersonSet
 from lp.soyuz.interfaces.archive import (

=== modified file 'lib/lp/buildmaster/doc/buildfarmjob.txt'
--- lib/lp/buildmaster/doc/buildfarmjob.txt	2010-05-04 13:42:25 +0000
+++ lib/lp/buildmaster/doc/buildfarmjob.txt	2010-08-30 02:12:47 +0000
@@ -2,7 +2,8 @@
 ============
 
     >>> from lp.buildmaster.interfaces.buildfarmjob import (
-    ...     BuildFarmJobType, IBuildFarmJob)
+    ...     IBuildFarmJob)
+    >>> from lp.buildmaster.enums import BuildFarmJobType
     >>> from lp.buildmaster.model.buildfarmjob import (
     ...     BuildFarmJob, BuildFarmJobDerived)
 

=== added file 'lib/lp/buildmaster/enums.py'
--- lib/lp/buildmaster/enums.py	1970-01-01 00:00:00 +0000
+++ lib/lp/buildmaster/enums.py	2010-08-30 02:12:47 +0000
@@ -0,0 +1,133 @@
+# Copyright 2009-2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+# pylint: disable-msg=E0211,E0213
+
+"""Common build interfaces."""
+
+__metaclass__ = type
+
+__all__ = [
+    'BuildStatus',
+    'BuildFarmJobType',
+    ]
+
+from lazr.enum import (
+    DBEnumeratedType,
+    DBItem,
+    )
+
+
+class BuildStatus(DBEnumeratedType):
+    """Build status type
+
+    Builds exist in the database in a number of states such as 'complete',
+    'needs build' and 'dependency wait'. We need to track these states in
+    order to correctly manage the autobuilder queues in the BuildQueue table.
+    """
+
+    NEEDSBUILD = DBItem(0, """
+        Needs building
+
+        Build record is fresh and needs building. Nothing is yet known to
+        block this build and it is a candidate for building on any free
+        builder of the relevant architecture
+        """)
+
+    FULLYBUILT = DBItem(1, """
+        Successfully built
+
+        Build record is an historic account of the build. The build is complete
+        and needs no further work to complete it. The build log etc are all
+        in place if available.
+        """)
+
+    FAILEDTOBUILD = DBItem(2, """
+        Failed to build
+
+        Build record is an historic account of the build. The build failed and
+        cannot be automatically retried. Either a new upload will be needed
+        or the build will have to be manually reset into 'NEEDSBUILD' when
+        the issue is corrected
+        """)
+
+    MANUALDEPWAIT = DBItem(3, """
+        Dependency wait
+
+        Build record represents a package whose build dependencies cannot
+        currently be satisfied within the relevant DistroArchSeries. This
+        build will have to be manually given back (put into 'NEEDSBUILD') when
+        the dependency issue is resolved.
+        """)
+
+    CHROOTWAIT = DBItem(4, """
+        Chroot problem
+
+        Build record represents a build which needs a chroot currently known
+        to be damaged or bad in some way. The buildd maintainer will have to
+        reset all relevant CHROOTWAIT builds to NEEDSBUILD after the chroot
+        has been fixed.
+        """)
+
+    SUPERSEDED = DBItem(5, """
+        Build for superseded Source
+
+        Build record represents a build which never got to happen because the
+        source package release for the build was superseded before the job
+        was scheduled to be run on a builder. Builds which reach this state
+        will rarely if ever be reset to any other state.
+        """)
+
+    BUILDING = DBItem(6, """
+        Currently building
+
+        Build record represents a build which is being build by one of the
+        available builders.
+        """)
+
+    FAILEDTOUPLOAD = DBItem(7, """
+        Failed to upload
+
+        Build record is an historic account of a build that could not be
+        uploaded correctly. It's mainly genereated by failures in
+        process-upload which quietly rejects the binary upload resulted
+        by the build procedure.
+        In those cases all the build historic information will be stored (
+        buildlog, datebuilt, duration, builder, etc) and the buildd admins
+        will be notified via process-upload about the reason of the rejection.
+        """)
+
+
+class BuildFarmJobType(DBEnumeratedType):
+    """Soyuz build farm job type.
+
+    An enumeration with the types of jobs that may be run on the Soyuz build
+    farm.
+    """
+
+    PACKAGEBUILD = DBItem(1, """
+        Binary package build
+
+        Build a source package.
+        """)
+
+    BRANCHBUILD = DBItem(2, """
+        Branch build
+
+        Build a package from a bazaar branch.
+        """)
+
+    RECIPEBRANCHBUILD = DBItem(3, """
+        Recipe branch build
+
+        Build a package from a bazaar branch and a recipe.
+        """)
+
+    TRANSLATIONTEMPLATESBUILD = DBItem(4, """
+        Translation template build
+
+        Generate translation templates from a bazaar branch.
+        """)
+
+
+

=== removed file 'lib/lp/buildmaster/interfaces/buildbase.py'
--- lib/lp/buildmaster/interfaces/buildbase.py	2010-08-24 09:51:26 +0000
+++ lib/lp/buildmaster/interfaces/buildbase.py	1970-01-01 00:00:00 +0000
@@ -1,101 +0,0 @@
-# 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
-
-"""Common build interfaces."""
-
-__metaclass__ = type
-
-__all__ = [
-    'BUILDD_MANAGER_LOG_NAME',
-    'BuildStatus',
-    ]
-
-from lazr.enum import (
-    DBEnumeratedType,
-    DBItem,
-    )
-
-
-BUILDD_MANAGER_LOG_NAME = "slave-scanner"
-
-
-class BuildStatus(DBEnumeratedType):
-    """Build status type
-
-    Builds exist in the database in a number of states such as 'complete',
-    'needs build' and 'dependency wait'. We need to track these states in
-    order to correctly manage the autobuilder queues in the BuildQueue table.
-    """
-
-    NEEDSBUILD = DBItem(0, """
-        Needs building
-
-        Build record is fresh and needs building. Nothing is yet known to
-        block this build and it is a candidate for building on any free
-        builder of the relevant architecture
-        """)
-
-    FULLYBUILT = DBItem(1, """
-        Successfully built
-
-        Build record is an historic account of the build. The build is complete
-        and needs no further work to complete it. The build log etc are all
-        in place if available.
-        """)
-
-    FAILEDTOBUILD = DBItem(2, """
-        Failed to build
-
-        Build record is an historic account of the build. The build failed and
-        cannot be automatically retried. Either a new upload will be needed
-        or the build will have to be manually reset into 'NEEDSBUILD' when
-        the issue is corrected
-        """)
-
-    MANUALDEPWAIT = DBItem(3, """
-        Dependency wait
-
-        Build record represents a package whose build dependencies cannot
-        currently be satisfied within the relevant DistroArchSeries. This
-        build will have to be manually given back (put into 'NEEDSBUILD') when
-        the dependency issue is resolved.
-        """)
-
-    CHROOTWAIT = DBItem(4, """
-        Chroot problem
-
-        Build record represents a build which needs a chroot currently known
-        to be damaged or bad in some way. The buildd maintainer will have to
-        reset all relevant CHROOTWAIT builds to NEEDSBUILD after the chroot
-        has been fixed.
-        """)
-
-    SUPERSEDED = DBItem(5, """
-        Build for superseded Source
-
-        Build record represents a build which never got to happen because the
-        source package release for the build was superseded before the job
-        was scheduled to be run on a builder. Builds which reach this state
-        will rarely if ever be reset to any other state.
-        """)
-
-    BUILDING = DBItem(6, """
-        Currently building
-
-        Build record represents a build which is being build by one of the
-        available builders.
-        """)
-
-    FAILEDTOUPLOAD = DBItem(7, """
-        Failed to upload
-
-        Build record is an historic account of a build that could not be
-        uploaded correctly. It's mainly genereated by failures in
-        process-upload which quietly rejects the binary upload resulted
-        by the build procedure.
-        In those cases all the build historic information will be stored (
-        buildlog, datebuilt, duration, builder, etc) and the buildd admins
-        will be notified via process-upload about the reason of the rejection.
-        """)

=== modified file 'lib/lp/buildmaster/interfaces/buildfarmjob.py'
--- lib/lp/buildmaster/interfaces/buildfarmjob.py	2010-08-20 20:31:18 +0000
+++ lib/lp/buildmaster/interfaces/buildfarmjob.py	2010-08-30 02:12:47 +0000
@@ -14,12 +14,10 @@
     'IBuildFarmJobSource',
     'InconsistentBuildFarmJobError',
     'ISpecificBuildFarmJob',
-    'BuildFarmJobType',
     ]
 
 from lazr.enum import (
     DBEnumeratedType,
-    DBItem,
     )
 from lazr.restful.declarations import exported
 from lazr.restful.fields import Reference
@@ -37,6 +35,7 @@
 
 from canonical.launchpad import _
 from canonical.launchpad.interfaces.librarian import ILibraryFileAlias
+from lp.buildmaster.enums import BuildFarmJobType
 from lp.buildmaster.interfaces.builder import IBuilder
 from lp.soyuz.interfaces.processor import IProcessor
 
@@ -50,38 +49,6 @@
     """
 
 
-class BuildFarmJobType(DBEnumeratedType):
-    """Soyuz build farm job type.
-
-    An enumeration with the types of jobs that may be run on the Soyuz build
-    farm.
-    """
-
-    PACKAGEBUILD = DBItem(1, """
-        Binary package build
-
-        Build a source package.
-        """)
-
-    BRANCHBUILD = DBItem(2, """
-        Branch build
-
-        Build a package from a bazaar branch.
-        """)
-
-    RECIPEBRANCHBUILD = DBItem(3, """
-        Recipe branch build
-
-        Build a package from a bazaar branch and a recipe.
-        """)
-
-    TRANSLATIONTEMPLATESBUILD = DBItem(4, """
-        Translation template build
-
-        Generate translation templates from a bazaar branch.
-        """)
-
-
 class IBuildFarmJobOld(Interface):
     """Defines the previous non-database BuildFarmJob interface.
 

=== modified file 'lib/lp/buildmaster/interfaces/buildqueue.py'
--- lib/lp/buildmaster/interfaces/buildqueue.py	2010-08-20 20:31:18 +0000
+++ lib/lp/buildmaster/interfaces/buildqueue.py	2010-08-30 02:12:47 +0000
@@ -28,9 +28,9 @@
     )
 
 from canonical.launchpad import _
+from lp.buildmaster.enums import BuildFarmJobType
 from lp.buildmaster.interfaces.builder import IBuilder
 from lp.buildmaster.interfaces.buildfarmjob import (
-    BuildFarmJobType,
     IBuildFarmJob,
     )
 from lp.services.job.interfaces.job import IJob

=== modified file 'lib/lp/buildmaster/interfaces/packagebuild.py'
--- lib/lp/buildmaster/interfaces/packagebuild.py	2010-08-20 20:31:18 +0000
+++ lib/lp/buildmaster/interfaces/packagebuild.py	2010-08-30 02:12:47 +0000
@@ -24,7 +24,7 @@
 
 from canonical.launchpad import _
 from canonical.launchpad.interfaces.librarian import ILibraryFileAlias
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
 from lp.buildmaster.interfaces.buildfarmjob import IBuildFarmJob
 from lp.registry.interfaces.distribution import IDistribution
 from lp.registry.interfaces.distroseries import IDistroSeries

=== modified file 'lib/lp/buildmaster/manager.py'
--- lib/lp/buildmaster/manager.py	2010-08-20 20:31:18 +0000
+++ lib/lp/buildmaster/manager.py	2010-08-30 02:12:47 +0000
@@ -8,6 +8,7 @@
 __all__ = [
     'BaseDispatchResult',
     'BuilddManager',
+    'BUILDD_MANAGER_LOG_NAME',
     'FailDispatchResult',
     'RecordingSlave',
     'ResetDispatchResult',
@@ -32,10 +33,12 @@
 from canonical.config import config
 from canonical.launchpad.webapp import urlappend
 from canonical.librarian.db import write_transaction
-from lp.buildmaster.interfaces.buildbase import BUILDD_MANAGER_LOG_NAME
 from lp.services.twistedsupport.processmonitor import ProcessWithTimeout
 
 
+BUILDD_MANAGER_LOG_NAME = "slave-scanner"
+
+
 buildd_success_result_map = {
     'ensurepresent': True,
     'build': 'BuilderStatus.BUILDING',

=== modified file 'lib/lp/buildmaster/model/buildfarmjob.py'
--- lib/lp/buildmaster/model/buildfarmjob.py	2010-08-20 20:31:18 +0000
+++ lib/lp/buildmaster/model/buildfarmjob.py	2010-08-30 02:12:47 +0000
@@ -52,9 +52,9 @@
     IStoreSelector,
     MAIN_STORE,
     )
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
+from lp.buildmaster.enums import BuildFarmJobType
 from lp.buildmaster.interfaces.buildfarmjob import (
-    BuildFarmJobType,
     IBuildFarmJob,
     IBuildFarmJobOld,
     IBuildFarmJobSet,

=== modified file 'lib/lp/buildmaster/model/buildqueue.py'
--- lib/lp/buildmaster/model/buildqueue.py	2010-08-20 20:31:18 +0000
+++ lib/lp/buildmaster/model/buildqueue.py	2010-08-30 02:12:47 +0000
@@ -45,8 +45,8 @@
     MAIN_STORE,
     )
 from lp.app.errors import NotFoundError
+from lp.buildmaster.enums import BuildFarmJobType
 from lp.buildmaster.interfaces.buildfarmjob import (
-    BuildFarmJobType,
     IBuildFarmJob,
     )
 from lp.buildmaster.interfaces.buildfarmjobbehavior import (

=== modified file 'lib/lp/buildmaster/model/packagebuild.py'
--- lib/lp/buildmaster/model/packagebuild.py	2010-08-25 13:30:06 +0000
+++ lib/lp/buildmaster/model/packagebuild.py	2010-08-30 02:12:47 +0000
@@ -51,10 +51,7 @@
     MAIN_STORE,
     )
 from canonical.librarian.utils import copy_and_close
-from lp.buildmaster.interfaces.buildbase import (
-    BUILDD_MANAGER_LOG_NAME,
-    BuildStatus,
-    )
+from lp.buildmaster.enums import BuildStatus
 from lp.buildmaster.interfaces.buildfarmjob import IBuildFarmJobSource
 from lp.buildmaster.interfaces.packagebuild import (
     IPackageBuild,
@@ -68,7 +65,6 @@
 from lp.buildmaster.model.buildqueue import BuildQueue
 from lp.registry.interfaces.pocket import (
     PackagePublishingPocket,
-    pocketsuffix,
     )
 from lp.soyuz.adapters.archivedependencies import (
     default_component_dependency_name,
@@ -317,6 +313,7 @@
 
     def handleStatus(self, status, librarian, slave_status):
         """See `IPackageBuild`."""
+        from lp.buildmaster.manager import BUILDD_MANAGER_LOG_NAME
         logger = logging.getLogger(BUILDD_MANAGER_LOG_NAME)
         method = getattr(self, '_handleStatus_' + status, None)
         if method is None:

=== modified file 'lib/lp/buildmaster/tests/test_builder.py'
--- lib/lp/buildmaster/tests/test_builder.py	2010-08-25 11:01:59 +0000
+++ lib/lp/buildmaster/tests/test_builder.py	2010-08-30 02:12:47 +0000
@@ -15,7 +15,7 @@
     MAIN_STORE,
     )
 from canonical.testing import LaunchpadZopelessLayer
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
 from lp.buildmaster.interfaces.builder import IBuilderSet
 from lp.buildmaster.interfaces.buildfarmjobbehavior import (
     IBuildFarmJobBehavior,

=== modified file 'lib/lp/buildmaster/tests/test_buildfarmjob.py'
--- lib/lp/buildmaster/tests/test_buildfarmjob.py	2010-08-20 20:31:18 +0000
+++ lib/lp/buildmaster/tests/test_buildfarmjob.py	2010-08-30 02:12:47 +0000
@@ -22,9 +22,11 @@
     DatabaseFunctionalLayer,
     LaunchpadFunctionalLayer,
     )
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import (
+    BuildFarmJobType,
+    BuildStatus,
+    )
 from lp.buildmaster.interfaces.buildfarmjob import (
-    BuildFarmJobType,
     IBuildFarmJob,
     IBuildFarmJobSet,
     IBuildFarmJobSource,

=== modified file 'lib/lp/buildmaster/tests/test_buildfarmjobbehavior.py'
--- lib/lp/buildmaster/tests/test_buildfarmjobbehavior.py	2010-08-20 20:31:18 +0000
+++ lib/lp/buildmaster/tests/test_buildfarmjobbehavior.py	2010-08-30 02:12:47 +0000
@@ -7,7 +7,7 @@
 from zope.security.proxy import removeSecurityProxy
 
 from canonical.testing.layers import ZopelessDatabaseLayer
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
 from lp.buildmaster.interfaces.builder import CorruptBuildCookie
 from lp.buildmaster.model.buildfarmjobbehavior import BuildFarmJobBehaviorBase
 from lp.registry.interfaces.pocket import PackagePublishingPocket

=== modified file 'lib/lp/buildmaster/tests/test_buildqueue.py'
--- lib/lp/buildmaster/tests/test_buildqueue.py	2010-08-24 15:29:01 +0000
+++ lib/lp/buildmaster/tests/test_buildqueue.py	2010-08-30 02:12:47 +0000
@@ -27,12 +27,12 @@
     LaunchpadZopelessLayer,
     ZopelessDatabaseLayer,
     )
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import (
+    BuildFarmJobType,
+    BuildStatus,
+    )
 from lp.buildmaster.interfaces.builder import IBuilderSet
-from lp.buildmaster.interfaces.buildfarmjob import (
-    BuildFarmJobType,
-    IBuildFarmJob,
-    )
+from lp.buildmaster.interfaces.buildfarmjob import IBuildFarmJob
 from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet
 from lp.buildmaster.model.builder import specific_job_classes
 from lp.buildmaster.model.buildfarmjob import BuildFarmJobDerived

=== modified file 'lib/lp/buildmaster/tests/test_manager.py'
--- lib/lp/buildmaster/tests/test_manager.py	2010-08-20 20:31:18 +0000
+++ lib/lp/buildmaster/tests/test_manager.py	2010-08-30 02:12:47 +0000
@@ -36,7 +36,7 @@
     LaunchpadZopelessLayer,
     TwistedLayer,
     )
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
 from lp.buildmaster.interfaces.builder import IBuilderSet
 from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet
 from lp.buildmaster.manager import (

=== modified file 'lib/lp/buildmaster/tests/test_packagebuild.py'
--- lib/lp/buildmaster/tests/test_packagebuild.py	2010-08-24 12:16:10 +0000
+++ lib/lp/buildmaster/tests/test_packagebuild.py	2010-08-30 02:12:47 +0000
@@ -20,8 +20,10 @@
     LaunchpadFunctionalLayer,
     LaunchpadZopelessLayer,
     )
-from lp.buildmaster.interfaces.buildbase import BuildStatus
-from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType
+from lp.buildmaster.enums import (
+    BuildFarmJobType,
+    BuildStatus,
+    )
 from lp.buildmaster.interfaces.packagebuild import (
     IPackageBuild,
     IPackageBuildSet,

=== modified file 'lib/lp/code/browser/sourcepackagerecipebuild.py'
--- lib/lp/code/browser/sourcepackagerecipebuild.py	2010-08-20 20:31:18 +0000
+++ lib/lp/code/browser/sourcepackagerecipebuild.py	2010-08-30 02:12:47 +0000
@@ -27,7 +27,7 @@
     Link,
     Navigation,
     )
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
 from lp.code.interfaces.sourcepackagerecipebuild import (
     ISourcePackageRecipeBuild,
     )

=== modified file 'lib/lp/code/browser/tests/test_sourcepackagerecipe.py'
--- lib/lp/code/browser/tests/test_sourcepackagerecipe.py	2010-08-20 20:31:18 +0000
+++ lib/lp/code/browser/tests/test_sourcepackagerecipe.py	2010-08-30 02:12:47 +0000
@@ -31,7 +31,7 @@
     DatabaseFunctionalLayer,
     LaunchpadFunctionalLayer,
     )
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
 from lp.code.browser.sourcepackagerecipe import (
     SourcePackageRecipeRequestBuildsView,
     SourcePackageRecipeView,

=== modified file 'lib/lp/code/browser/tests/test_sourcepackagerecipebuild.py'
--- lib/lp/code/browser/tests/test_sourcepackagerecipebuild.py	2010-08-20 20:31:18 +0000
+++ lib/lp/code/browser/tests/test_sourcepackagerecipebuild.py	2010-08-30 02:12:47 +0000
@@ -21,7 +21,7 @@
     )
 from canonical.launchpad.webapp import canonical_url
 from canonical.testing import DatabaseFunctionalLayer
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
 from lp.soyuz.model.processor import ProcessorFamily
 from lp.testing import (
     ANONYMOUS,

=== modified file 'lib/lp/code/mail/tests/test_sourcepackagerecipebuild.py'
--- lib/lp/code/mail/tests/test_sourcepackagerecipebuild.py	2010-08-20 20:31:18 +0000
+++ lib/lp/code/mail/tests/test_sourcepackagerecipebuild.py	2010-08-30 02:12:47 +0000
@@ -13,7 +13,7 @@
 
 from canonical.config import config
 from canonical.testing import LaunchpadFunctionalLayer
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
 from lp.code.mail.sourcepackagerecipebuild import (
     SourcePackageRecipeBuildMailer,
     )

=== modified file 'lib/lp/code/model/sourcepackagerecipe.py'
--- lib/lp/code/model/sourcepackagerecipe.py	2010-08-23 16:51:11 +0000
+++ lib/lp/code/model/sourcepackagerecipe.py	2010-08-30 02:12:47 +0000
@@ -35,7 +35,7 @@
     IMasterStore,
     IStore,
     )
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
 from lp.buildmaster.model.buildfarmjob import BuildFarmJob
 from lp.buildmaster.model.packagebuild import PackageBuild
 from lp.code.errors import (

=== modified file 'lib/lp/code/model/sourcepackagerecipebuild.py'
--- lib/lp/code/model/sourcepackagerecipebuild.py	2010-08-26 14:29:45 +0000
+++ lib/lp/code/model/sourcepackagerecipebuild.py	2010-08-30 02:12:47 +0000
@@ -45,8 +45,10 @@
     IArchiveUploadPolicy,
     SOURCE_PACKAGE_RECIPE_UPLOAD_POLICY_NAME,
     )
-from lp.buildmaster.interfaces.buildbase import BuildStatus
-from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType
+from lp.buildmaster.enums import (
+    BuildFarmJobType,
+    BuildStatus,
+    )
 from lp.buildmaster.model.buildfarmjob import BuildFarmJobOldDerived
 from lp.buildmaster.model.buildqueue import BuildQueue
 from lp.buildmaster.model.packagebuild import (

=== modified file 'lib/lp/code/model/tests/test_recipebuilder.py'
--- lib/lp/code/model/tests/test_recipebuilder.py	2010-08-20 20:31:18 +0000
+++ lib/lp/code/model/tests/test_recipebuilder.py	2010-08-30 02:12:47 +0000
@@ -16,8 +16,8 @@
 
 from canonical.launchpad.scripts.logger import BufferLogger
 from canonical.testing import LaunchpadFunctionalLayer
+from lp.buildmaster.enums import BuildFarmJobType
 from lp.buildmaster.interfaces.builder import CannotBuild
-from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType
 from lp.buildmaster.interfaces.buildfarmjobbehavior import (
     IBuildFarmJobBehavior,
     )

=== modified file 'lib/lp/code/model/tests/test_sourcepackagerecipe.py'
--- lib/lp/code/model/tests/test_sourcepackagerecipe.py	2010-08-23 16:51:11 +0000
+++ lib/lp/code/model/tests/test_sourcepackagerecipe.py	2010-08-30 02:12:47 +0000
@@ -28,7 +28,7 @@
     AppServerLayer,
     DatabaseFunctionalLayer,
     )
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
 from lp.buildmaster.interfaces.buildqueue import IBuildQueue
 from lp.buildmaster.model.buildqueue import BuildQueue
 from lp.code.errors import (

=== modified file 'lib/lp/code/model/tests/test_sourcepackagerecipebuild.py'
--- lib/lp/code/model/tests/test_sourcepackagerecipebuild.py	2010-08-24 09:51:26 +0000
+++ lib/lp/code/model/tests/test_sourcepackagerecipebuild.py	2010-08-30 02:12:47 +0000
@@ -24,7 +24,7 @@
     LaunchpadZopelessLayer,
     )
 from lp.app.errors import NotFoundError
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
 from lp.buildmaster.interfaces.buildqueue import IBuildQueue
 from lp.buildmaster.tests.test_packagebuild import (
     TestGetUploadMethodsMixin,

=== modified file 'lib/lp/registry/browser/person.py'
--- lib/lp/registry/browser/person.py	2010-08-27 22:33:36 +0000
+++ lib/lp/registry/browser/person.py	2010-08-30 02:12:47 +0000
@@ -240,7 +240,7 @@
     IBugTaskSet,
     UNRESOLVED_BUGTASK_STATUSES,
     )
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
 from lp.code.browser.sourcepackagerecipelisting import HasRecipesMenuMixin
 from lp.code.errors import InvalidNamespace
 from lp.code.interfaces.branchnamespace import IBranchNamespaceSet

=== modified file 'lib/lp/registry/browser/tests/test_person_view.py'
--- lib/lp/registry/browser/tests/test_person_view.py	2010-08-24 15:29:01 +0000
+++ lib/lp/registry/browser/tests/test_person_view.py	2010-08-30 02:12:47 +0000
@@ -20,7 +20,7 @@
     LaunchpadZopelessLayer,
     )
 from lp.app.errors import NotFoundError
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
 from lp.registry.browser.person import (
     PersonEditView,
     PersonView,

=== modified file 'lib/lp/registry/model/sourcepackage.py'
--- lib/lp/registry/model/sourcepackage.py	2010-08-24 15:29:01 +0000
+++ lib/lp/registry/model/sourcepackage.py	2010-08-30 02:12:47 +0000
@@ -50,7 +50,7 @@
     HasBugHeatMixin,
     )
 from lp.bugs.model.bugtask import BugTask
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
 from lp.code.interfaces.seriessourcepackagebranch import (
     IMakeOfficialBranchLinks,
     )

=== modified file 'lib/lp/soyuz/browser/archive.py'
--- lib/lp/soyuz/browser/archive.py	2010-08-24 15:29:01 +0000
+++ lib/lp/soyuz/browser/archive.py	2010-08-30 02:12:47 +0000
@@ -98,7 +98,7 @@
 from canonical.widgets.textwidgets import StrippedTextWidget
 from lp.app.browser.stringformatter import FormattersAPI
 from lp.app.errors import NotFoundError
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
 from lp.registry.interfaces.person import (
     IPersonSet,
     PersonVisibility,

=== modified file 'lib/lp/soyuz/browser/build.py'
--- lib/lp/soyuz/browser/build.py	2010-08-24 12:25:48 +0000
+++ lib/lp/soyuz/browser/build.py	2010-08-30 02:12:47 +0000
@@ -42,7 +42,7 @@
 from canonical.launchpad.webapp.interfaces import ICanonicalUrlData
 from canonical.lazr.utils import safe_hasattr
 from lp.app.errors import UnexpectedFormData
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
 from lp.services.job.interfaces.job import JobStatus
 from lp.soyuz.interfaces.binarypackagebuild import (
     IBinaryPackageBuild,

=== modified file 'lib/lp/soyuz/browser/tests/archive-views.txt'
--- lib/lp/soyuz/browser/tests/archive-views.txt	2010-08-23 16:51:11 +0000
+++ lib/lp/soyuz/browser/tests/archive-views.txt	2010-08-30 02:12:47 +0000
@@ -360,7 +360,7 @@
 
 Let's set some builds appropriately to see the results.
 
-    >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
+    >>> from lp.buildmaster.enums import BuildStatus
     >>> from lp.soyuz.interfaces.binarypackagebuild import (
     ...     IBinaryPackageBuildSet)
     >>> warty_hppa = getUtility(IDistributionSet)['ubuntu']['warty']['hppa']

=== modified file 'lib/lp/soyuz/browser/tests/build-views.txt'
--- lib/lp/soyuz/browser/tests/build-views.txt	2010-08-24 15:29:01 +0000
+++ lib/lp/soyuz/browser/tests/build-views.txt	2010-08-30 02:12:47 +0000
@@ -4,7 +4,7 @@
 from the sampledata which happens to be in FAILEDTOBUILD status.
 
     >>> from zope.component import getUtility
-    >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
+    >>> from lp.buildmaster.enums import BuildStatus
     >>> from lp.registry.interfaces.distribution import IDistributionSet
 
     >>> ubuntu = getUtility(IDistributionSet).getByName('ubuntu')

=== modified file 'lib/lp/soyuz/browser/tests/builder-views.txt'
--- lib/lp/soyuz/browser/tests/builder-views.txt	2010-08-24 15:29:01 +0000
+++ lib/lp/soyuz/browser/tests/builder-views.txt	2010-08-30 02:12:47 +0000
@@ -141,7 +141,7 @@
 SoyuzTestPublisher is used to make a new publication only in Celso's
 private PPA.
 
-    >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
+    >>> from lp.buildmaster.enums import BuildStatus
     >>> from lp.soyuz.tests.test_publishing import (
     ...      SoyuzTestPublisher)
     >>> from lp.soyuz.enums import (

=== modified file 'lib/lp/soyuz/doc/archive.txt'
--- lib/lp/soyuz/doc/archive.txt	2010-08-24 15:29:01 +0000
+++ lib/lp/soyuz/doc/archive.txt	2010-08-30 02:12:47 +0000
@@ -938,7 +938,7 @@
 be returned, but you can also ask for releases with builds in a certain
 state.
 
-    >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
+    >>> from lp.buildmaster.enums import BuildStatus
     >>> releases = cprov_archive.getSourcePackageReleases(
     ...     build_status=BuildStatus.FULLYBUILT)
     >>> for release in releases:

=== modified file 'lib/lp/soyuz/doc/binarypackagebuild.txt'
--- lib/lp/soyuz/doc/binarypackagebuild.txt	2010-08-25 12:57:29 +0000
+++ lib/lp/soyuz/doc/binarypackagebuild.txt	2010-08-30 02:12:47 +0000
@@ -136,7 +136,7 @@
 
 If the build does not have any uploads, None is returned:
 
-    >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
+    >>> from lp.buildmaster.enums import BuildStatus
     >>> from lp.soyuz.interfaces.binarypackagebuild import (
     ...     IBinaryPackageBuildSet)
     >>> at_build = getUtility(IBinaryPackageBuildSet).getByBuildID(15)

=== modified file 'lib/lp/soyuz/doc/build-estimated-dispatch-time.txt'
--- lib/lp/soyuz/doc/build-estimated-dispatch-time.txt	2010-05-20 15:30:16 +0000
+++ lib/lp/soyuz/doc/build-estimated-dispatch-time.txt	2010-08-30 02:12:47 +0000
@@ -44,7 +44,7 @@
 the pending job.
 
     >>> from datetime import timedelta
-    >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
+    >>> from lp.buildmaster.enums import BuildStatus
     >>> alsa_build = alsa_spr.createBuild(
     ...     hoary['i386'], PackagePublishingPocket.RELEASE,
     ...     hoary.main_archive)

=== modified file 'lib/lp/soyuz/doc/build-notification.txt'
--- lib/lp/soyuz/doc/build-notification.txt	2010-08-23 16:51:11 +0000
+++ lib/lp/soyuz/doc/build-notification.txt	2010-08-30 02:12:47 +0000
@@ -419,7 +419,7 @@
   >>> from lp.registry.interfaces.person import IPersonSet
   >>> cprov = getUtility(IPersonSet).getByName('cprov')
 
-  >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
+  >>> from lp.buildmaster.enums import BuildStatus
   >>> failed_candidate = cprov.archive.getBuildRecords(
   ...     build_state=BuildStatus.FAILEDTOBUILD, name='cdrkit')[0]
 

=== modified file 'lib/lp/soyuz/doc/buildd-dispatching.txt'
--- lib/lp/soyuz/doc/buildd-dispatching.txt	2010-06-02 16:32:10 +0000
+++ lib/lp/soyuz/doc/buildd-dispatching.txt	2010-08-30 02:12:47 +0000
@@ -186,7 +186,7 @@
 
     >>> BuilddSlaveTestSetup().tearDown()
 
-    >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
+    >>> from lp.buildmaster.enums import BuildStatus
     >>> build.status = BuildStatus.FAILEDTOBUILD
     >>> job.destroySelf()
     >>> flush_database_updates()

=== modified file 'lib/lp/soyuz/doc/buildd-slavescanner.txt'
--- lib/lp/soyuz/doc/buildd-slavescanner.txt	2010-08-24 15:29:01 +0000
+++ lib/lp/soyuz/doc/buildd-slavescanner.txt	2010-08-30 02:12:47 +0000
@@ -429,7 +429,7 @@
 Now in order to emulate a successfully binary upload we will update
 the build record to FULLYBUILT, as the process-upload would do:
 
-    >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
+    >>> from lp.buildmaster.enums import BuildStatus
     >>> build.status = BuildStatus.FULLYBUILT
 
 Now the updateBuild should recognize this build record as a

=== modified file 'lib/lp/soyuz/doc/hasbuildrecords.txt'
--- lib/lp/soyuz/doc/hasbuildrecords.txt	2010-03-06 04:57:40 +0000
+++ lib/lp/soyuz/doc/hasbuildrecords.txt	2010-08-30 02:12:47 +0000
@@ -22,7 +22,7 @@
 The method has a number of filtering options, such as filtering by build
 status,
 
-    >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
+    >>> from lp.buildmaster.enums import BuildStatus
     >>> hoary.getBuildRecords(build_state=BuildStatus.FULLYBUILT).count()
     2
 

=== modified file 'lib/lp/soyuz/doc/packageupload-lookups.txt'
--- lib/lp/soyuz/doc/packageupload-lookups.txt	2010-03-06 04:57:40 +0000
+++ lib/lp/soyuz/doc/packageupload-lookups.txt	2010-08-30 02:12:47 +0000
@@ -29,7 +29,7 @@
 
     # Audit the source publication and builds of a given archive
     # and report missing uploads.
-    >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
+    >>> from lp.buildmaster.enums import BuildStatus
     >>> def check_upload_lookups(archive):
     ...     sources_missing_upload = []
     ...     sources = list(archive.getPublishedSources())

=== modified file 'lib/lp/soyuz/doc/publishing.txt'
--- lib/lp/soyuz/doc/publishing.txt	2010-08-24 15:29:01 +0000
+++ lib/lp/soyuz/doc/publishing.txt	2010-08-30 02:12:47 +0000
@@ -139,7 +139,7 @@
 augments the IBuildSet.getStatusSummaryForBuilds() method to include the
 'pending' state when builds are fully built but not yet published.
 
-    >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
+    >>> from lp.buildmaster.enums import BuildStatus
     >>> spph = test_publisher.getPubSource(
     ...     sourcename='abc', architecturehintlist='any')
     >>> builds = spph.createMissingBuilds()

=== modified file 'lib/lp/soyuz/doc/queuebuilder.txt'
--- lib/lp/soyuz/doc/queuebuilder.txt	2010-08-24 15:29:01 +0000
+++ lib/lp/soyuz/doc/queuebuilder.txt	2010-08-30 02:12:47 +0000
@@ -232,7 +232,7 @@
     >>> copied_pub = pub_failed.copyTo(
     ...     hoary, PackagePublishingPocket.RELEASE, warty.main_archive)
 
-    >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
+    >>> from lp.buildmaster.enums import BuildStatus
     >>> from lp.soyuz.interfaces.binarypackagebuild import (
     ...     IBinaryPackageBuildSet)
     >>> failed_build = pub_failed.sourcepackagerelease.createBuild(

=== modified file 'lib/lp/soyuz/doc/sourcepackagerelease-build-lookup.txt'
--- lib/lp/soyuz/doc/sourcepackagerelease-build-lookup.txt	2010-08-24 15:29:01 +0000
+++ lib/lp/soyuz/doc/sourcepackagerelease-build-lookup.txt	2010-08-30 02:12:47 +0000
@@ -43,7 +43,7 @@
     >>> hoary_evo_source = hoary.getSourcePackage('evolution')
     >>> evo_release = hoary_evo_source['1.0'].sourcepackagerelease
 
-    >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
+    >>> from lp.buildmaster.enums import BuildStatus
     >>> evo_build_i386 = evo_release.createBuild(
     ...     hoary_i386, pocket_release, ubuntu.main_archive,
     ...     status=BuildStatus.FULLYBUILT)

=== modified file 'lib/lp/soyuz/doc/soyuz-set-of-uploads.txt'
--- lib/lp/soyuz/doc/soyuz-set-of-uploads.txt	2010-08-26 15:28:34 +0000
+++ lib/lp/soyuz/doc/soyuz-set-of-uploads.txt	2010-08-30 02:12:47 +0000
@@ -608,7 +608,7 @@
 
 Check there's a SourcePackageRelease with no build.
 
-  >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
+  >>> from lp.buildmaster.enums import BuildStatus
   >>> from lp.registry.model.sourcepackagename import SourcePackageName
   >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
   >>> from lp.soyuz.model.binarypackagebuild import BinaryPackageBuild

=== modified file 'lib/lp/soyuz/interfaces/binarypackagebuild.py'
--- lib/lp/soyuz/interfaces/binarypackagebuild.py	2010-08-20 20:31:18 +0000
+++ lib/lp/soyuz/interfaces/binarypackagebuild.py	2010-08-30 02:12:47 +0000
@@ -38,7 +38,7 @@
     )
 
 from canonical.launchpad import _
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
 from lp.buildmaster.interfaces.packagebuild import IPackageBuild
 from lp.soyuz.interfaces.processor import IProcessor
 from lp.soyuz.interfaces.publishing import ISourcePackagePublishingHistory

=== modified file 'lib/lp/soyuz/model/archive.py'
--- lib/lp/soyuz/model/archive.py	2010-08-24 15:29:01 +0000
+++ lib/lp/soyuz/model/archive.py	2010-08-30 02:12:47 +0000
@@ -75,7 +75,7 @@
     re_isadeb,
     re_issource,
     )
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
 from lp.buildmaster.interfaces.packagebuild import IPackageBuildSet
 from lp.buildmaster.model.buildfarmjob import BuildFarmJob
 from lp.buildmaster.model.packagebuild import PackageBuild

=== modified file 'lib/lp/soyuz/model/binarypackagebuild.py'
--- lib/lp/soyuz/model/binarypackagebuild.py	2010-08-25 11:01:59 +0000
+++ lib/lp/soyuz/model/binarypackagebuild.py	2010-08-30 02:12:47 +0000
@@ -69,8 +69,10 @@
 from canonical.launchpad.webapp.tales import DurationFormatterAPI
 from lp.app.errors import NotFoundError
 from lp.archivepublisher.utils import get_ppa_reference
-from lp.buildmaster.interfaces.buildbase import BuildStatus
-from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType
+from lp.buildmaster.enums import (
+    BuildFarmJobType,
+    BuildStatus,
+    )
 from lp.buildmaster.interfaces.packagebuild import IPackageBuildSource
 from lp.buildmaster.model.builder import Builder
 from lp.buildmaster.model.buildfarmjob import BuildFarmJob

=== modified file 'lib/lp/soyuz/model/buildfarmbuildjob.py'
--- lib/lp/soyuz/model/buildfarmbuildjob.py	2010-08-20 20:31:18 +0000
+++ lib/lp/soyuz/model/buildfarmbuildjob.py	2010-08-30 02:12:47 +0000
@@ -10,7 +10,7 @@
 from zope.interface import implements
 
 from canonical.database.constants import UTC_NOW
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
 from lp.buildmaster.model.buildfarmjob import BuildFarmJobOld
 from lp.soyuz.interfaces.buildfarmbuildjob import IBuildFarmBuildJob
 

=== modified file 'lib/lp/soyuz/model/buildpackagejob.py'
--- lib/lp/soyuz/model/buildpackagejob.py	2010-08-24 15:29:01 +0000
+++ lib/lp/soyuz/model/buildpackagejob.py	2010-08-30 02:12:47 +0000
@@ -19,7 +19,7 @@
 from zope.interface import implements
 
 from canonical.database.sqlbase import sqlvalues
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
 from lp.buildmaster.model.buildfarmjob import BuildFarmJobOldDerived
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.registry.interfaces.sourcepackage import SourcePackageUrgency

=== modified file 'lib/lp/soyuz/model/publishing.py'
--- lib/lp/soyuz/model/publishing.py	2010-08-24 15:29:01 +0000
+++ lib/lp/soyuz/model/publishing.py	2010-08-30 02:12:47 +0000
@@ -63,7 +63,7 @@
     MAIN_STORE,
     )
 from lp.app.errors import NotFoundError
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
 from lp.buildmaster.model.buildfarmjob import BuildFarmJob
 from lp.buildmaster.model.packagebuild import PackageBuild
 from lp.registry.interfaces.person import validate_public_person

=== modified file 'lib/lp/soyuz/model/sourcepackagerelease.py'
--- lib/lp/soyuz/model/sourcepackagerelease.py	2010-08-24 15:29:01 +0000
+++ lib/lp/soyuz/model/sourcepackagerelease.py	2010-08-30 02:12:47 +0000
@@ -53,7 +53,7 @@
 from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
 from lp.app.errors import NotFoundError
 from lp.archiveuploader.utils import determine_source_file_type
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
 from lp.registry.interfaces.person import validate_public_person
 from lp.registry.interfaces.sourcepackage import (
     SourcePackageType,

=== modified file 'lib/lp/soyuz/scripts/buildd.py'
--- lib/lp/soyuz/scripts/buildd.py	2010-08-20 20:31:18 +0000
+++ lib/lp/soyuz/scripts/buildd.py	2010-08-30 02:12:47 +0000
@@ -17,7 +17,7 @@
 from lp.app.errors import NotFoundError
 from lp.archivepublisher.debversion import Version
 from lp.archivepublisher.utils import process_in_batches
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
 from lp.buildmaster.interfaces.builder import IBuilderSet
 from lp.registry.interfaces.distribution import IDistributionSet
 from lp.registry.interfaces.series import SeriesStatus

=== modified file 'lib/lp/soyuz/scripts/gina/handlers.py'
--- lib/lp/soyuz/scripts/gina/handlers.py	2010-08-24 15:29:01 +0000
+++ lib/lp/soyuz/scripts/gina/handlers.py	2010-08-30 02:12:47 +0000
@@ -38,7 +38,7 @@
     determine_binary_file_type,
     determine_source_file_type,
     )
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
 from lp.registry.interfaces.person import (
     IPersonSet,
     PersonCreationRationale,

=== modified file 'lib/lp/soyuz/scripts/initialise_distroseries.py'
--- lib/lp/soyuz/scripts/initialise_distroseries.py	2010-08-25 11:01:59 +0000
+++ lib/lp/soyuz/scripts/initialise_distroseries.py	2010-08-30 02:12:47 +0000
@@ -18,7 +18,7 @@
     MAIN_STORE,
     MASTER_FLAVOR,
     )
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.soyuz.adapters.packagelocation import PackageLocation
 from lp.soyuz.enums import (

=== modified file 'lib/lp/soyuz/scripts/packagecopier.py'
--- lib/lp/soyuz/scripts/packagecopier.py	2010-08-24 13:56:22 +0000
+++ lib/lp/soyuz/scripts/packagecopier.py	2010-08-30 02:12:47 +0000
@@ -25,7 +25,7 @@
 
 from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
 from canonical.librarian.utils import copy_and_close
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
 from lp.soyuz.adapters.packagelocation import build_package_location
 from lp.soyuz.enums import ArchivePurpose
 from lp.soyuz.interfaces.archive import (

=== modified file 'lib/lp/soyuz/scripts/tests/test_buildd_cronscripts.py'
--- lib/lp/soyuz/scripts/tests/test_buildd_cronscripts.py	2010-08-20 20:31:18 +0000
+++ lib/lp/soyuz/scripts/tests/test_buildd_cronscripts.py	2010-08-30 02:12:47 +0000
@@ -25,7 +25,7 @@
     LaunchpadLayer,
     LaunchpadZopelessLayer,
     )
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
 from lp.buildmaster.model.buildfarmjob import BuildFarmJob
 from lp.buildmaster.model.packagebuild import PackageBuild
 from lp.registry.interfaces.distribution import IDistributionSet

=== modified file 'lib/lp/soyuz/scripts/tests/test_copypackage.py'
--- lib/lp/soyuz/scripts/tests/test_copypackage.py	2010-08-24 15:29:01 +0000
+++ lib/lp/soyuz/scripts/tests/test_copypackage.py	2010-08-30 02:12:47 +0000
@@ -28,7 +28,7 @@
     IBugSet,
     )
 from lp.bugs.interfaces.bugtask import BugTaskStatus
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
 from lp.registry.interfaces.distribution import IDistributionSet
 from lp.registry.interfaces.person import IPersonSet
 from lp.registry.interfaces.pocket import PackagePublishingPocket

=== modified file 'lib/lp/soyuz/scripts/tests/test_initialise_distroseries.py'
--- lib/lp/soyuz/scripts/tests/test_initialise_distroseries.py	2010-08-27 06:52:42 +0000
+++ lib/lp/soyuz/scripts/tests/test_initialise_distroseries.py	2010-08-30 02:12:47 +0000
@@ -21,7 +21,7 @@
     MASTER_FLAVOR,
     )
 from canonical.testing.layers import LaunchpadZopelessLayer
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.soyuz.interfaces.archivepermission import IArchivePermissionSet
 from lp.soyuz.interfaces.packageset import IPackagesetSet

=== modified file 'lib/lp/soyuz/scripts/tests/test_populatearchive.py'
--- lib/lp/soyuz/scripts/tests/test_populatearchive.py	2010-08-24 15:29:01 +0000
+++ lib/lp/soyuz/scripts/tests/test_populatearchive.py	2010-08-30 02:12:47 +0000
@@ -19,7 +19,7 @@
     )
 from canonical.testing import LaunchpadZopelessLayer
 from canonical.testing.layers import DatabaseLayer
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
 from lp.registry.interfaces.distribution import IDistributionSet
 from lp.registry.interfaces.person import IPersonSet
 from lp.services.job.interfaces.job import JobStatus

=== modified file 'lib/lp/soyuz/stories/ppa/xx-copy-packages.txt'
--- lib/lp/soyuz/stories/ppa/xx-copy-packages.txt	2010-08-24 15:29:01 +0000
+++ lib/lp/soyuz/stories/ppa/xx-copy-packages.txt	2010-08-30 02:12:47 +0000
@@ -972,7 +972,7 @@
     ...     archive=jblack_friends.archive,
     ...     status=PackagePublishingStatus.PUBLISHED)
     >>> [build] = jblack_friends_foo_src.createMissingBuilds()
-    >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
+    >>> from lp.buildmaster.enums import BuildStatus
     >>> build.status = BuildStatus.FAILEDTOBUILD
 
     >>> flush_database_updates()

=== modified file 'lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt'
--- lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt	2010-05-26 08:53:13 +0000
+++ lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt	2010-08-30 02:12:47 +0000
@@ -410,7 +410,7 @@
 If the ppa has some current activity (building or waiting builds) then this
 is also included in the statistics portlet.
 
-    >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
+    >>> from lp.buildmaster.enums import BuildStatus
     >>> from lp.registry.interfaces.person import IPersonSet
     >>> from lp.soyuz.interfaces.binarypackagebuild import (
     ...     IBinaryPackageBuildSet)

=== modified file 'lib/lp/soyuz/stories/soyuz/xx-build-record.txt'
--- lib/lp/soyuz/stories/soyuz/xx-build-record.txt	2010-06-08 15:13:29 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-build-record.txt	2010-08-30 02:12:47 +0000
@@ -153,7 +153,7 @@
     # build with an known buildlog 'tail'.
     >>> login('[e-mail]')
     >>> from canonical.database.constants import UTC_NOW
-    >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
+    >>> from lp.buildmaster.enums import BuildStatus
     >>> in_progress_build.buildqueue_record.reset()
     >>> build.buildqueue_record.markAsBuilding(bob_builder)
     >>> build.buildqueue_record.logtail = 'one line\nanother line'

=== modified file 'lib/lp/soyuz/stories/soyuz/xx-buildfarm-index.txt'
--- lib/lp/soyuz/stories/soyuz/xx-buildfarm-index.txt	2010-06-25 23:12:45 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-buildfarm-index.txt	2010-08-30 02:12:47 +0000
@@ -60,7 +60,7 @@
     >>> import datetime
     >>> from zope.component import getUtility
     >>> from zope.security.proxy import removeSecurityProxy
-    >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
+    >>> from lp.buildmaster.enums import BuildStatus
     >>> from lp.registry.interfaces.person import IPersonSet
     >>> login('[e-mail]')
     >>> cprov = getUtility(IPersonSet).getByName('cprov')

=== modified file 'lib/lp/soyuz/stories/webservice/xx-builds.txt'
--- lib/lp/soyuz/stories/webservice/xx-builds.txt	2010-06-14 18:14:28 +0000
+++ lib/lp/soyuz/stories/webservice/xx-builds.txt	2010-08-30 02:12:47 +0000
@@ -200,7 +200,7 @@
 alter the buildstate to one that cannot be retried:
 
     >>> login('[e-mail]')
-    >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
+    >>> from lp.buildmaster.enums import BuildStatus
     >>> build.status = BuildStatus.FAILEDTOUPLOAD
     >>> logout()
 

=== modified file 'lib/lp/soyuz/tests/test_archive.py'
--- lib/lp/soyuz/tests/test_archive.py	2010-08-24 15:29:01 +0000
+++ lib/lp/soyuz/tests/test_archive.py	2010-08-30 02:12:47 +0000
@@ -23,7 +23,7 @@
     DatabaseFunctionalLayer,
     LaunchpadZopelessLayer,
     )
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.registry.interfaces.series import SeriesStatus
 from lp.services.job.interfaces.job import JobStatus

=== modified file 'lib/lp/soyuz/tests/test_binarypackagebuild.py'
--- lib/lp/soyuz/tests/test_binarypackagebuild.py	2010-08-25 11:01:59 +0000
+++ lib/lp/soyuz/tests/test_binarypackagebuild.py	2010-08-30 02:12:47 +0000
@@ -14,7 +14,7 @@
 from zope.security.proxy import removeSecurityProxy
 
 from canonical.testing import LaunchpadZopelessLayer
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
 from lp.buildmaster.interfaces.builder import IBuilderSet
 from lp.buildmaster.interfaces.buildqueue import IBuildQueue
 from lp.buildmaster.interfaces.packagebuild import IPackageBuild

=== modified file 'lib/lp/soyuz/tests/test_buildpackagejob.py'
--- lib/lp/soyuz/tests/test_buildpackagejob.py	2010-08-24 15:29:01 +0000
+++ lib/lp/soyuz/tests/test_buildpackagejob.py	2010-08-30 02:12:47 +0000
@@ -17,7 +17,7 @@
     DatabaseFunctionalLayer,
     LaunchpadZopelessLayer,
     )
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
 from lp.buildmaster.interfaces.builder import IBuilderSet
 from lp.soyuz.enums import ArchivePurpose
 from lp.soyuz.interfaces.buildfarmbuildjob import IBuildFarmBuildJob

=== modified file 'lib/lp/soyuz/tests/test_copyarchivejob.py'
--- lib/lp/soyuz/tests/test_copyarchivejob.py	2010-08-24 15:29:01 +0000
+++ lib/lp/soyuz/tests/test_copyarchivejob.py	2010-08-30 02:12:47 +0000
@@ -9,7 +9,7 @@
 from zope.security.proxy import removeSecurityProxy
 
 from canonical.testing import DatabaseFunctionalLayer
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.soyuz.adapters.packagelocation import PackageLocation
 from lp.soyuz.enums import ArchivePurpose

=== modified file 'lib/lp/soyuz/tests/test_hasbuildrecords.py'
--- lib/lp/soyuz/tests/test_hasbuildrecords.py	2010-08-20 20:31:18 +0000
+++ lib/lp/soyuz/tests/test_hasbuildrecords.py	2010-08-30 02:12:47 +0000
@@ -7,9 +7,9 @@
 from zope.security.proxy import removeSecurityProxy
 
 from canonical.testing import LaunchpadZopelessLayer
+from lp.buildmaster.enums import BuildFarmJobType
 from lp.buildmaster.interfaces.builder import IBuilderSet
 from lp.buildmaster.interfaces.buildfarmjob import (
-    BuildFarmJobType,
     IBuildFarmJob,
     )
 from lp.buildmaster.interfaces.packagebuild import IPackageBuildSource
@@ -144,7 +144,7 @@
         # can only test this by creating a lone IBuildFarmJob of a
         # different type.
         from lp.buildmaster.interfaces.buildfarmjob import IBuildFarmJobSource
-        from lp.buildmaster.interfaces.buildbase import BuildStatus
+        from lp.buildmaster.enums import BuildStatus
         build_farm_job = getUtility(IBuildFarmJobSource).new(
             job_type=BuildFarmJobType.RECIPEBRANCHBUILD, virtualized=True,
             status=BuildStatus.BUILDING)

=== modified file 'lib/lp/soyuz/tests/test_packagecloner.py'
--- lib/lp/soyuz/tests/test_packagecloner.py	2010-08-24 15:29:01 +0000
+++ lib/lp/soyuz/tests/test_packagecloner.py	2010-08-30 02:12:47 +0000
@@ -7,7 +7,7 @@
 from zope.security.proxy import removeSecurityProxy
 
 from canonical.testing import LaunchpadZopelessLayer
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.soyuz.adapters.packagelocation import PackageLocation
 from lp.soyuz.enums import (

=== modified file 'lib/lp/soyuz/tests/test_packageupload.py'
--- lib/lp/soyuz/tests/test_packageupload.py	2010-08-24 15:29:01 +0000
+++ lib/lp/soyuz/tests/test_packageupload.py	2010-08-30 02:12:47 +0000
@@ -13,7 +13,7 @@
 from canonical.launchpad.scripts import BufferLogger
 from canonical.testing import LaunchpadZopelessLayer
 from lp.archiveuploader.tests import datadir
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
 from lp.registry.interfaces.distribution import IDistributionSet
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.registry.interfaces.series import SeriesStatus

=== modified file 'lib/lp/soyuz/tests/test_publishing.py'
--- lib/lp/soyuz/tests/test_publishing.py	2010-08-24 12:25:48 +0000
+++ lib/lp/soyuz/tests/test_publishing.py	2010-08-30 02:12:47 +0000
@@ -28,7 +28,7 @@
 from lp.app.errors import NotFoundError
 from lp.archivepublisher.config import Config
 from lp.archivepublisher.diskpool import DiskPool
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
 from lp.registry.interfaces.distribution import IDistributionSet
 from lp.registry.interfaces.distroseries import IDistroSeriesSet
 from lp.registry.interfaces.person import IPersonSet

=== modified file 'lib/lp/soyuz/tests/test_publishing_models.py'
--- lib/lp/soyuz/tests/test_publishing_models.py	2010-08-20 20:31:18 +0000
+++ lib/lp/soyuz/tests/test_publishing_models.py	2010-08-30 02:12:47 +0000
@@ -8,7 +8,7 @@
 
 from canonical.database.constants import UTC_NOW
 from canonical.testing import LaunchpadZopelessLayer
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
 from lp.soyuz.interfaces.publishing import (
     IPublishingSet,
     PackagePublishingStatus,

=== modified file 'lib/lp/testing/factory.py'
--- lib/lp/testing/factory.py	2010-08-27 04:24:55 +0000
+++ lib/lp/testing/factory.py	2010-08-30 02:12:47 +0000
@@ -110,9 +110,11 @@
     IBugTrackerSet,
     )
 from lp.bugs.interfaces.bugwatch import IBugWatchSet
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import (
+    BuildFarmJobType,
+    BuildStatus,
+    )
 from lp.buildmaster.interfaces.builder import IBuilderSet
-from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType
 from lp.buildmaster.model.buildqueue import BuildQueue
 from lp.code.enums import (
     BranchMergeProposalStatus,

=== modified file 'lib/lp/testing/tests/test_factory.py'
--- lib/lp/testing/tests/test_factory.py	2010-08-24 15:29:01 +0000
+++ lib/lp/testing/tests/test_factory.py	2010-08-30 02:12:47 +0000
@@ -17,7 +17,7 @@
     DatabaseFunctionalLayer,
     LaunchpadZopelessLayer,
     )
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
 from lp.code.enums import (
     BranchType,
     CodeImportReviewStatus,

=== modified file 'lib/lp/translations/model/translationtemplatesbuildjob.py'
--- lib/lp/translations/model/translationtemplatesbuildjob.py	2010-08-25 09:27:12 +0000
+++ lib/lp/translations/model/translationtemplatesbuildjob.py	2010-08-30 02:12:47 +0000
@@ -23,8 +23,8 @@
     IMasterStore,
     IStore,
     )
+from lp.buildmaster.enums import BuildFarmJobType
 from lp.buildmaster.interfaces.buildfarmbranchjob import IBuildFarmBranchJob
-from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType
 from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet
 from lp.buildmaster.model.buildfarmjob import (
     BuildFarmJobOld,

=== modified file 'lib/lp/translations/tests/test_translationtemplatesbuildbehavior.py'
--- lib/lp/translations/tests/test_translationtemplatesbuildbehavior.py	2010-08-20 20:31:18 +0000
+++ lib/lp/translations/tests/test_translationtemplatesbuildbehavior.py	2010-08-30 02:12:47 +0000
@@ -16,7 +16,7 @@
 from canonical.launchpad.interfaces import ILaunchpadCelebrities
 from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
 from canonical.testing import LaunchpadZopelessLayer
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
 from lp.buildmaster.interfaces.buildfarmjobbehavior import (
     IBuildFarmJobBehavior,
     )

=== modified file 'scripts/ftpmaster-tools/buildd-mass-retry.py'
--- scripts/ftpmaster-tools/buildd-mass-retry.py	2010-08-02 23:29:05 +0000
+++ scripts/ftpmaster-tools/buildd-mass-retry.py	2010-08-30 02:12:47 +0000
@@ -26,7 +26,7 @@
 from canonical.launchpad.scripts import (
     execute_zcml_for_scripts, logger_options, logger)
 from canonical.lp import initZopeless
-from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.enums import BuildStatus
 from lp.registry.interfaces.distribution import IDistributionSet
 from lp.registry.interfaces.pocket import PackagePublishingPocket