Merge lp:~jml/launchpad/fix-import-warnings into lp:launchpad

[Jonathan Lange]

Fix all of the import problems that were exposed by checking the 'lp' package

[Jonathan Lange (jml)]

This fixes a bunch of the import warnings, hopefully in a sane way.

[Michael Hudson-Doyle (mwhudson)]

All good.

review: Approve

=== modified file 'lib/lp/bugs/browser/bug.py'
--- lib/lp/bugs/browser/bug.py	2009-12-09 16:32:19 +0000
+++ lib/lp/bugs/browser/bug.py	2010-01-10 04:32:20 +0000
@@ -49,9 +49,8 @@
 from canonical.cachedproperty import cachedproperty
 
 from canonical.launchpad import _
-from canonical.launchpad.interfaces._schema_circular_imports import IBug
 from canonical.launchpad.webapp.interfaces import ILaunchBag, NotFoundError
-from lp.bugs.interfaces.bug import IBugSet
+from lp.bugs.interfaces.bug import IBug, IBugSet
 from lp.bugs.interfaces.bugattachment import BugAttachmentType
 from lp.bugs.interfaces.bugtask import (
     BugTaskSearchParams, BugTaskStatus, IBugTask, IFrontPageBugTaskSearch)

=== modified file 'lib/lp/bugs/browser/bugtarget.py'
--- lib/lp/bugs/browser/bugtarget.py	2009-12-16 10:31:39 +0000
+++ lib/lp/bugs/browser/bugtarget.py	2010-01-10 04:32:20 +0000
@@ -39,6 +39,7 @@
 from canonical.cachedproperty import cachedproperty
 from canonical.config import config
 from lp.bugs.browser.bugtask import BugTaskSearchListingView
+from lp.bugs.interfaces.bug import IBug
 from canonical.launchpad.browser.feeds import (
     BugFeedLink, BugTargetLatestBugsFeedLink, FeedsMixin,
     PersonLatestBugsFeedLink)
@@ -50,8 +51,6 @@
     BugTaskStatus, IBugTaskSet, UNRESOLVED_BUGTASK_STATUSES)
 from canonical.launchpad.interfaces.launchpad import (
     IHasExternalBugTracker, ILaunchpadUsage)
-from canonical.launchpad.interfaces._schema_circular_imports import (
-    IBug, IDistribution)
 from canonical.launchpad.interfaces.hwdb import IHWSubmissionSet
 from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
 from canonical.launchpad.interfaces.temporaryblobstorage import (
@@ -62,11 +61,13 @@
 from lp.bugs.interfaces.bug import (
     CreateBugParams, IBugAddForm, IProjectBugAddForm)
 from lp.bugs.interfaces.malone import IMaloneApplication
+from lp.registry.interfaces.distribution import IDistribution
 from lp.registry.interfaces.distributionsourcepackage import (
     IDistributionSourcePackage)
 from lp.registry.interfaces.distroseries import IDistroSeries
-from lp.registry.interfaces.product import IProduct, IProject
+from lp.registry.interfaces.product import IProduct
 from lp.registry.interfaces.productseries import IProductSeries
+from lp.registry.interfaces.project import IProject
 from lp.registry.interfaces.sourcepackage import ISourcePackage
 from canonical.launchpad.webapp import (
     LaunchpadEditFormView, LaunchpadFormView, LaunchpadView, action,

=== modified file 'lib/lp/bugs/subscribers/bug.py'
--- lib/lp/bugs/subscribers/bug.py	2009-06-25 00:40:31 +0000
+++ lib/lp/bugs/subscribers/bug.py	2010-01-10 04:32:20 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# Copyright 2009, 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 __metaclass__ = type
@@ -6,19 +6,20 @@
 
 
 from canonical.database.sqlbase import block_implicit_flushes
-from canonical.launchpad.interfaces._schema_circular_imports import IPerson
+from lp.registry.interfaces.person import IPerson
+
+
 @block_implicit_flushes
 def notify_bug_modified(bug, event):
     """Handle bug change events.
-    
+
     Subscribe the security contacts for a bug when it
     becomes security-related.
     """
     if (event.object.security_related and
         not event.object_before_modification.security_related):
-        # The bug turned to be security-related, 
-        # subscribe the security contact.
+        # The bug turned out to be security-related, subscribe the security
+        # contact.
         for pillar in bug.affected_pillars:
             if pillar.security_contact is not None:
                 bug.subscribe(pillar.security_contact, IPerson(event.user))
-

=== modified file 'lib/lp/bugs/subscribers/bugactivity.py'
--- lib/lp/bugs/subscribers/bugactivity.py	2009-07-17 00:26:05 +0000
+++ lib/lp/bugs/subscribers/bugactivity.py	2010-01-10 04:32:20 +0000
@@ -15,9 +15,11 @@
 from canonical.database.sqlbase import block_implicit_flushes
 from lp.bugs.adapters.bugchange import (
     BugWatchAdded, BugWatchRemoved)
-from canonical.launchpad.interfaces._schema_circular_imports import IBug, IPerson
+from lp.bugs.interfaces.bug import IBug
 from lp.bugs.interfaces.bugactivity import IBugActivitySet
-from lp.registry.interfaces.milestone import IMilestone, IProductRelease
+from lp.registry.interfaces.milestone import IMilestone
+from lp.registry.interfaces.person import IPerson
+from lp.registry.interfaces.productrelease import IProductRelease
 from lp.soyuz.interfaces.sourcepackagerelease import ISourcePackageRelease
 from lp.bugs.adapters.bugchange import BugTaskAdded
 

=== modified file 'lib/lp/bugs/subscribers/buglastupdated.py'
--- lib/lp/bugs/subscribers/buglastupdated.py	2009-06-25 00:40:31 +0000
+++ lib/lp/bugs/subscribers/buglastupdated.py	2010-01-10 04:32:20 +0000
@@ -9,8 +9,10 @@
 
 import pytz
 
-from canonical.launchpad.interfaces._schema_circular_imports import IBug
+from lp.bugs.interfaces.bug import IBug
 from canonical.launchpad.interfaces.launchpad import IHasBug
+
+
 def update_bug_date_last_updated(object, event):
     """Update IBug.date_last_updated to the current date."""
     if IBug.providedBy(object):

=== modified file 'lib/lp/code/browser/branch.py'
--- lib/lp/code/browser/branch.py	2009-12-18 15:14:45 +0000
+++ lib/lp/code/browser/branch.py	2010-01-10 04:32:20 +0000
@@ -79,16 +79,14 @@
 from lp.code.browser.branchmergeproposal import (
     latest_proposals_for_each_branch)
 from lp.code.enums import (
-    BranchLifecycleStatus, BranchType, RevisionControlSystems,
-    UICreatableBranchType)
+    BranchLifecycleStatus, BranchType, CodeImportJobState,
+    CodeImportReviewStatus, RevisionControlSystems, UICreatableBranchType)
 from lp.code.errors import InvalidBranchMergeProposal
 from lp.code.interfaces.branch import (
     BranchCreationForbidden, BranchExists, IBranch,
     user_has_special_branch_access)
 from lp.code.interfaces.branchtarget import IBranchTarget
-from lp.code.interfaces.codeimport import CodeImportReviewStatus
-from lp.code.interfaces.codeimportjob import (
-    CodeImportJobState, ICodeImportJobWorkflow)
+from lp.code.interfaces.codeimportjob import ICodeImportJobWorkflow
 from lp.code.interfaces.branchnamespace import IBranchNamespacePolicy
 from lp.code.interfaces.codereviewvote import ICodeReviewVoteReference
 from lp.registry.interfaces.person import IPerson, IPersonSet

=== modified file 'lib/lp/code/interfaces/branch.py'
--- lib/lp/code/interfaces/branch.py	2009-12-09 08:10:10 +0000
+++ lib/lp/code/interfaces/branch.py	2010-01-10 04:32:20 +0000
@@ -50,8 +50,7 @@
     call_with, collection_default_content, export_as_webservice_collection,
     export_as_webservice_entry, export_factory_operation,
     export_operation_as, export_read_operation, export_write_operation,
-    exported, operation_parameters, operation_returns_collection_of,
-    operation_returns_entry, REQUEST_USER)
+    exported, operation_parameters, operation_returns_entry, REQUEST_USER)
 
 from canonical.config import config
 

=== modified file 'lib/lp/code/interfaces/branchjob.py'
--- lib/lp/code/interfaces/branchjob.py	2009-12-03 21:29:28 +0000
+++ lib/lp/code/interfaces/branchjob.py	2010-01-10 04:32:20 +0000
@@ -15,8 +15,11 @@
     'IBranchDiffJobSource',
     'IBranchUpgradeJob',
     'IBranchUpgradeJobSource',
+    'IReclaimBranchSpaceJob',
+    'IReclaimBranchSpaceJobSource',
     'IRevisionMailJob',
     'IRevisionMailJobSource',
+    'IRevisionsAddedJob',
     'IRevisionsAddedJobSource',
     'IRosettaUploadJob',
     'IRosettaUploadJobSource',
@@ -31,7 +34,6 @@
 from lp.services.job.interfaces.job import IJob, IRunnableJob
 
 
-
 class IBranchJob(Interface):
     """A job related to a branch."""
 
@@ -164,7 +166,6 @@
     def iterReady():
         """Iterate through ready IRosettaUploadJobs."""
 
-
     def findUnfinishedJobs(branch, since=None):
         """Find any `IRosettaUploadJob`s for `branch` that haven't run yet.
 
@@ -193,4 +194,3 @@
 
     def iterReady():
         """Iterate through ready IReclaimBranchSpaceJobs."""
-

=== modified file 'lib/lp/code/interfaces/branchmergeproposal.py'
--- lib/lp/code/interfaces/branchmergeproposal.py	2010-01-06 14:14:35 +0000
+++ lib/lp/code/interfaces/branchmergeproposal.py	2010-01-10 04:32:20 +0000
@@ -16,6 +16,8 @@
     'ICreateMergeProposalJobSource',
     'IMergeProposalCreatedJob',
     'IMergeProposalCreatedJobSource',
+    'IUpdatePreviewDiffJobSource',
+    'notify_modified',
     ]
 
 
@@ -129,8 +131,8 @@
 
     reviewed_revision_id = exported(
         Text(
-            title=_("The revision id that has been approved by the reviewer.")
-            ),
+            title=_(
+                "The revision id that has been approved by the reviewer.")),
         exported_as='reviewed_revno')
 
     commit_message = exported(
@@ -259,7 +261,7 @@
         CollectionField(
             title=_('The votes cast or expected for this proposal'),
             value_type=Reference(schema=Interface), #ICodeReviewVoteReference
-            readonly=True
+            readonly=True,
             )
         )
 
@@ -604,6 +606,8 @@
         """Get a context for running this kind of job in."""
 
 
+# XXX: JonathanLange 2010-01-06: This is only used in the scanner, perhaps it
+# should be moved there.
 def notify_modified(proposal, func, *args, **kwargs):
     """Call func, then notify about the changes it made.
 

=== modified file 'lib/lp/code/model/branchjob.py'
--- lib/lp/code/model/branchjob.py	2009-12-10 18:20:09 +0000
+++ lib/lp/code/model/branchjob.py	2010-01-10 04:32:20 +0000
@@ -190,7 +190,7 @@
 
     def getOopsVars(self):
         """See `IRunnableJob`."""
-        vars =  BaseRunnableJob.getOopsVars(self)
+        vars = BaseRunnableJob.getOopsVars(self)
         vars.extend([
             ('branch_job_id', self.context.id),
             ('branch_job_type', self.context.job_type.title)])
@@ -203,8 +203,8 @@
     """A Job that calculates the a diff related to a Branch."""
 
     implements(IBranchDiffJob)
-
     classProvides(IBranchDiffJobSource)
+
     @classmethod
     def create(cls, branch, from_revision_spec, to_revision_spec):
         """See `IBranchDiffJobSource`."""
@@ -439,7 +439,7 @@
         history = self.bzr_branch.revision_history()
         for num, revid in enumerate(history):
             if revid in added_revisions:
-                yield repository.get_revision(revid), num+1
+                yield repository.get_revision(revid), num + 1
 
     def generateDiffs(self):
         """Determine whether to generate diffs."""
@@ -930,4 +930,3 @@
             shutil.rmtree(mirrored_path)
         if os.path.exists(hosted_path):
             shutil.rmtree(hosted_path)
-

=== modified file 'lib/lp/code/model/branchmergeproposaljob.py'
--- lib/lp/code/model/branchmergeproposaljob.py	2010-01-07 21:02:00 +0000
+++ lib/lp/code/model/branchmergeproposaljob.py	2010-01-10 04:32:20 +0000
@@ -12,6 +12,7 @@
     'BranchMergeProposalJob',
     'CreateMergeProposalJob',
     'MergeProposalCreatedJob',
+    'UpdatePreviewDiffJob',
     ]
 
 import contextlib

=== modified file 'lib/lp/code/model/branchnamespace.py'
--- lib/lp/code/model/branchnamespace.py	2009-08-04 00:41:49 +0000
+++ lib/lp/code/model/branchnamespace.py	2010-01-10 04:32:20 +0000
@@ -6,7 +6,6 @@
 __metaclass__ = type
 __all__ = [
     'BranchNamespaceSet',
-    'get_namespace',
     'PackageNamespace',
     'PersonalNamespace',
     'ProductNamespace',
@@ -47,9 +46,9 @@
     IProduct, IProductSet, NoSuchProduct)
 from lp.registry.interfaces.sourcepackagename import (
     ISourcePackageNameSet, NoSuchSourcePackageName)
+from lp.services.utils import iter_split
 from canonical.launchpad.webapp.interfaces import (
     IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)
-from lp.code.xmlrpc.codehosting import iter_split
 
 
 class _BaseNamespace:

=== modified file 'lib/lp/code/model/codeimport.py'
--- lib/lp/code/model/codeimport.py	2010-01-05 21:29:59 +0000
+++ lib/lp/code/model/codeimport.py	2010-01-10 04:32:20 +0000
@@ -35,12 +35,11 @@
 from lp.registry.model.productseries import ProductSeries
 from canonical.launchpad.webapp.interfaces import NotFoundError
 from lp.code.enums import (
-    BranchType, CodeImportResultStatus, CodeImportReviewStatus,
-    RevisionControlSystems)
+    BranchType, CodeImportJobState, CodeImportResultStatus,
+    CodeImportReviewStatus, RevisionControlSystems)
 from lp.code.interfaces.codeimport import ICodeImport, ICodeImportSet
 from lp.code.interfaces.codeimportevent import ICodeImportEventSet
-from lp.code.interfaces.codeimportjob import (
-    CodeImportJobState, ICodeImportJobWorkflow)
+from lp.code.interfaces.codeimportjob import ICodeImportJobWorkflow
 from lp.code.interfaces.branchnamespace import (
     get_branch_namespace)
 from lp.code.model.codeimportresult import CodeImportResult

=== modified file 'lib/lp/codehosting/inmemory.py'
--- lib/lp/codehosting/inmemory.py	2009-08-28 06:39:38 +0000
+++ lib/lp/codehosting/inmemory.py	2010-01-10 04:32:20 +0000
@@ -6,7 +6,7 @@
 __metaclass__ = type
 __all__ = [
     'InMemoryFrontend',
-    'XMLRPCWrapper'
+    'XMLRPCWrapper',
     ]
 
 import operator
@@ -28,10 +28,10 @@
     BRANCH_TRANSPORT, CONTROL_TRANSPORT, LAUNCHPAD_ANONYMOUS,
     LAUNCHPAD_SERVICES)
 from lp.registry.interfaces.pocket import PackagePublishingPocket
+from lp.services.utils import iter_split
 from lp.testing.factory import ObjectFactory
 from canonical.launchpad.validators import LaunchpadValidationError
-from lp.code.xmlrpc.codehosting import (
-    datetime_from_tuple, iter_split)
+from lp.code.xmlrpc.codehosting import datetime_from_tuple
 from canonical.launchpad.xmlrpc import faults
 
 

=== modified file 'lib/lp/codehosting/puller/worker.py'
--- lib/lp/codehosting/puller/worker.py	2009-12-22 00:26:49 +0000
+++ lib/lp/codehosting/puller/worker.py	2010-01-10 04:32:20 +0000
@@ -32,13 +32,11 @@
     'BranchMirrorer',
     'BranchLoopError',
     'BranchReferenceForbidden',
-    'BranchReferenceValueError',
     'get_canonical_url_for_branch_name',
     'install_worker_ui_factory',
     'PullerWorker',
     'PullerWorkerProtocol',
     'StackedOnBranchNotFound',
-    'URLChecker',
     ]
 
 
@@ -363,8 +361,8 @@
             stacked-on branch for the product of the branch we are mirroring.
             None or '' if there is no such branch.
         :param protocol: An instance of `PullerWorkerProtocol`.
-        :param branch_mirrorer: An instance of `BranchMirrorer`.  If not passed,
-            one will be chosen based on the value of `branch_type`.
+        :param branch_mirrorer: An instance of `BranchMirrorer`.  If not
+            passed, one will be chosen based on the value of `branch_type`.
         :param oops_prefix: An oops prefix to pass to `setOopsToken` on the
             global ErrorUtility.
         """
@@ -519,6 +517,7 @@
 WORKER_ACTIVITY_PROGRESS_BAR = 'progress bar'
 WORKER_ACTIVITY_NETWORK = 'network'
 
+
 class PullerWorkerUIFactory(SilentUIFactory):
     """An UIFactory that always says yes to breaking locks."""
 

=== modified file 'lib/lp/codehosting/scanner/bzrsync.py'
--- lib/lp/codehosting/scanner/bzrsync.py	2009-12-17 02:00:16 +0000
+++ lib/lp/codehosting/scanner/bzrsync.py	2010-01-10 04:32:20 +0000
@@ -9,6 +9,8 @@
 
 __all__ = [
     "BzrSync",
+    'schedule_diff_updates',
+    'schedule_translation_upload',
     ]
 
 import logging
@@ -31,8 +33,7 @@
 from lp.codehosting.puller.worker import BranchMirrorer
 from lp.codehosting.scanner import events
 from lp.codehosting.vfs.branchfs import BranchPolicy
-from lp.code.interfaces.branch import (
-    BranchFormat, ControlFormat, RepositoryFormat)
+from lp.code.bzr import BranchFormat, ControlFormat, RepositoryFormat
 from lp.code.interfaces.branchjob import IRosettaUploadJobSource
 from lp.code.interfaces.branchrevision import IBranchRevisionSet
 from lp.code.interfaces.revision import IRevisionSet

=== modified file 'lib/lp/codehosting/scanner/email.py'
--- lib/lp/codehosting/scanner/email.py	2009-06-30 16:56:07 +0000
+++ lib/lp/codehosting/scanner/email.py	2010-01-10 04:32:20 +0000
@@ -11,12 +11,11 @@
 
 from zope.component import adapter, getUtility
 
-from lp.codehosting.scanner import events
 from canonical.config import config
+from lp.code.enums import BranchSubscriptionNotificationLevel
 from lp.code.interfaces.branchjob import (
     IRevisionsAddedJobSource, IRevisionMailJobSource)
-from lp.code.interfaces.branchsubscription import (
-    BranchSubscriptionNotificationLevel)
+from lp.codehosting.scanner import events
 
 
 def subscribers_want_notification(db_branch):

=== modified file 'lib/lp/codehosting/vfs/branchfs.py'
--- lib/lp/codehosting/vfs/branchfs.py	2009-12-22 23:50:27 +0000
+++ lib/lp/codehosting/vfs/branchfs.py	2010-01-10 04:32:20 +0000
@@ -50,6 +50,7 @@
     'AsyncLaunchpadTransport',
     'BadUrl',
     'BadUrlLaunchpad',
+    'BadUrlScheme',
     'BadUrlSsh',
     'branch_id_to_path',
     'BranchPolicy',
@@ -108,6 +109,7 @@
 
 class BadUrlScheme(BadUrl):
     """Found a URL with an untrusted scheme."""
+
     def __init__(self, scheme, url):
         BadUrl.__init__(self, scheme, url)
         self.scheme = scheme
@@ -441,6 +443,7 @@
 
 
 class DirectDatabaseLaunchpadServer(AsyncVirtualServer):
+
     def __init__(self, scheme, branch_transport):
         AsyncVirtualServer.__init__(self, scheme)
         self._transport_dispatch = BranchTransportDispatch(branch_transport)

=== modified file 'lib/lp/registry/browser/distributionsourcepackage.py'
--- lib/lp/registry/browser/distributionsourcepackage.py	2009-12-05 18:37:28 +0000
+++ lib/lp/registry/browser/distributionsourcepackage.py	2010-01-10 04:32:20 +0000
@@ -44,12 +44,13 @@
 from lp.soyuz.browser.sourcepackagerelease import (
     extract_bug_numbers, extract_email_addresses, linkify_changelog)
 from lp.soyuz.interfaces.archive import IArchiveSet
+from lp.registry.interfaces.distributionsourcepackage import (
+    IDistributionSourcePackage)
 from lp.soyuz.interfaces.distributionsourcepackagerelease import (
     IDistributionSourcePackageRelease)
 from lp.soyuz.interfaces.packagediff import IPackageDiffSet
 from lp.registry.browser.packaging import PackagingDeleteView
 from lp.registry.interfaces.pocket import pocketsuffix
-from lp.registry.interfaces.product import IDistributionSourcePackage
 from lp.translations.browser.customlanguagecode import (
     HasCustomLanguageCodesTraversalMixin)
 

=== modified file 'lib/lp/registry/browser/mentoringoffer.py'
--- lib/lp/registry/browser/mentoringoffer.py	2009-06-25 04:06:00 +0000
+++ lib/lp/registry/browser/mentoringoffer.py	2010-01-10 04:32:20 +0000
@@ -16,11 +16,11 @@
     ]
 
 from canonical.launchpad import _
+from lp.bugs.interfaces.bugtask import IBugTask
 from lp.blueprints.interfaces.specification import ISpecification
 from lp.registry.interfaces.distribution import IDistribution
 from lp.registry.interfaces.mentoringoffer import (
     IMentoringOffer, IMentoringOfferSet)
-from lp.registry.interfaces.milestone import IBugTask
 from lp.registry.interfaces.person import IPerson
 from lp.registry.interfaces.product import IProduct
 from lp.registry.interfaces.project import IProject

=== modified file 'lib/lp/registry/browser/person.py'
--- lib/lp/registry/browser/person.py	2010-01-06 13:42:17 +0000
+++ lib/lp/registry/browser/person.py	2010-01-10 04:32:20 +0000
@@ -144,7 +144,7 @@
     BugTaskSearchParams, BugTaskStatus, UNRESOLVED_BUGTASK_STATUSES)
 from lp.services.worlddata.interfaces.country import ICountry
 from canonical.launchpad.interfaces.emailaddress import (
-    EmailAddressStatus, IEmailAddressSet)
+    EmailAddressStatus, IEmailAddress, IEmailAddressSet)
 from canonical.launchpad.interfaces.geoip import IRequestPreferredLanguages
 from canonical.launchpad.interfaces.gpghandler import (
     GPGKeyNotFoundError, IGPGHandler)
@@ -165,7 +165,7 @@
 from lp.registry.interfaces.mailinglistsubscription import (
     MailingListAutoSubscribePolicy)
 from lp.registry.interfaces.person import (
-    IEmailAddress, INewPerson, IPerson, IPersonChangePassword, IPersonClaim,
+    INewPerson, IPerson, IPersonChangePassword, IPersonClaim,
     IPersonSet, ITeam, ITeamReassignment, PersonCreationRationale,
     PersonVisibility, TeamMembershipRenewalPolicy, TeamSubscriptionPolicy)
 from lp.registry.interfaces.poll import IPollSet, IPollSubset

=== 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-10 04:32:20 +0000
@@ -58,7 +58,7 @@
 from lp.blueprints.browser.specificationtarget import (
     HasSpecificationsMenuMixin)
 from lp.bugs.interfaces.bugtask import RESOLVED_BUGTASK_STATUSES
-from lp.bugs.interfaces.bugwatch import IBugTracker
+from lp.bugs.interfaces.bugtracker import IBugTracker
 from lp.services.worlddata.interfaces.country import ICountry
 from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
 from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet

=== modified file 'lib/lp/registry/browser/structuralsubscription.py'
--- lib/lp/registry/browser/structuralsubscription.py	2009-12-05 18:37:28 +0000
+++ lib/lp/registry/browser/structuralsubscription.py	2010-01-10 04:32:20 +0000
@@ -17,7 +17,8 @@
 from zope.schema.vocabulary import SimpleTerm, SimpleVocabulary
 
 from canonical.cachedproperty import cachedproperty
-from lp.registry.interfaces.product import IDistributionSourcePackage
+from lp.registry.interfaces.distributionsourcepackage import (
+    IDistributionSourcePackage)
 from lp.registry.interfaces.structuralsubscription import (
     BugNotificationLevel, IStructuralSubscriptionForm)
 from lp.registry.interfaces.structuralsubscription import (
@@ -30,6 +31,7 @@
 from canonical.launchpad.webapp.menu import Link
 from canonical.widgets import LabeledMultiCheckBoxWidget
 
+
 class StructuralSubscriptionView(LaunchpadFormView):
     """View class for structural subscriptions."""
 
@@ -137,7 +139,7 @@
                                if self.isSubscribed(team))
         return {
             'subscribe_me': self.currentUserIsSubscribed(),
-            'subscriptions_team': subscribed_teams
+            'subscriptions_team': subscribed_teams,
             }
 
     def isSubscribed(self, person):
@@ -175,7 +177,7 @@
         is_subscribed = self.isSubscribed(self.user)
         subscribe = data['subscribe_me']
         if (not is_subscribed) and subscribe:
-            sub = target.addBugSubscription(self.user, self.user)
+            target.addBugSubscription(self.user, self.user)
             self.request.response.addNotification(
                 'You have subscribed to "%s". You will now receive an '
                 'e-mail each time someone reports or changes one of '
@@ -204,7 +206,7 @@
             team for team in teams if self.isSubscribed(team))
 
         for team in form_selected_teams - subscriptions:
-            sub = target.addBugSubscription(team, self.user)
+            target.addBugSubscription(team, self.user)
             self.request.response.addNotification(
                 'The %s team will now receive an e-mail each time '
                 'someone reports or changes a public bug in "%s".' % (
@@ -225,7 +227,7 @@
         target = self.context
         new_subscription = data['new_subscription']
         if new_subscription is not None:
-            sub = target.addBugSubscription(new_subscription, self.user)
+            target.addBugSubscription(new_subscription, self.user)
             self.request.response.addNotification(
                 '%s will now receive an e-mail each time someone '
                 'reports or changes a public bug in "%s".' % (
@@ -288,7 +290,7 @@
 
     def subscribe(self):
         """The subscribe menu link.
-        
+
         If the user, or any of the teams he's a member of, already has a
         subscription to the context, the link offer to edit the subscriptions
         and displays the edit icon. Otherwise, the link offers to subscribe

=== 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-10 04:32:20 +0000
@@ -13,6 +13,7 @@
     'IDistroSeriesEditRestricted',
     'IDistroSeriesPublic',
     'IDistroSeriesSet',
+    'ISeriesMixin',
     'NoSuchDistroSeries',
     ]
 

=== modified file 'lib/lp/registry/model/distributionsourcepackage.py'
--- lib/lp/registry/model/distributionsourcepackage.py	2009-12-05 18:37:28 +0000
+++ lib/lp/registry/model/distributionsourcepackage.py	2010-01-10 04:32:20 +0000
@@ -31,8 +31,9 @@
 from lp.bugs.model.bugtarget import BugTargetBase
 from lp.bugs.model.bugtask import BugTask
 from lp.code.model.hasbranches import HasBranchesMixin, HasMergeProposalsMixin
+from lp.registry.interfaces.distributionsourcepackage import (
+    IDistributionSourcePackage)
 from lp.registry.interfaces.pocket import PackagePublishingPocket
-from lp.registry.interfaces.product import IDistributionSourcePackage
 from lp.registry.model.karma import KarmaTotalCache
 from lp.registry.model.person import Person
 from lp.registry.model.sourcepackage import (

=== modified file 'lib/lp/registry/model/product.py'
--- lib/lp/registry/model/product.py	2010-01-06 12:18:25 +0000
+++ lib/lp/registry/model/product.py	2010-01-10 04:32:20 +0000
@@ -221,7 +221,7 @@
         dbName='mugshot', foreignKey='LibraryFileAlias', default=None)
     screenshotsurl = StringCol(
         dbName='screenshotsurl', notNull=False, default=None)
-    wikiurl =  StringCol(dbName='wikiurl', notNull=False, default=None)
+    wikiurl = StringCol(dbName='wikiurl', notNull=False, default=None)
     programminglang = StringCol(
         dbName='programminglang', notNull=False, default=None)
     downloadurl = StringCol(dbName='downloadurl', notNull=False, default=None)
@@ -773,7 +773,7 @@
             Specification.product = %s AND
             Specification.id = MentoringOffer.specification
             """ % sqlvalues(self.id) + """ AND NOT
-            (""" + Specification.completeness_clause +")",
+            (""" + Specification.completeness_clause + ")",
             clauseTables=['Specification'],
             distinct=True)
         via_bugs = MentoringOffer.select("""
@@ -876,7 +876,7 @@
 
         # filter based on completion. see the implementation of
         # Specification.is_complete() for more details
-        completeness =  Specification.completeness_clause
+        completeness = Specification.completeness_clause
 
         if SpecificationFilter.COMPLETE in filter:
             query += ' AND ( %s ) ' % completeness
@@ -929,7 +929,6 @@
             series.driver = owner
         return series
 
-
     def getRelease(self, version):
         """See `IProduct`."""
         store = Store.of(self)
@@ -959,14 +958,14 @@
             Packaging.productseriesID == ProductSeries.id,
             ProductSeries.product == self,
             Packaging.distroseriesID == DistroSeries.id,
-            DistroSeries.distributionID == Distribution.id
+            DistroSeries.distributionID == Distribution.id,
             ).config(distinct=True).order_by(Distribution.name)
 
     def setBugSupervisor(self, bug_supervisor, user):
         """See `IHasBugSupervisor`."""
         self.bug_supervisor = bug_supervisor
         if bug_supervisor is not None:
-            subscription = self.addBugSubscription(bug_supervisor, user)
+            self.addBugSubscription(bug_supervisor, user)
 
     def composeCustomLanguageCodeMatch(self):
         """See `HasCustomLanguageCodesMixin`."""
@@ -1008,8 +1007,7 @@
             series.getTimeline(include_inactive=include_inactive)
             for series in series_list
             if include_inactive or series.active or
-               series == self.development_focus
-            ]
+               series == self.development_focus]
 
 
 class ProductSet:
@@ -1296,7 +1294,7 @@
             Product.id == ProductSeries.productID,
             POTemplate.productseriesID == ProductSeries.id,
             Product.official_rosetta == True,
-            Person.id == Product._ownerID
+            Person.id == Product._ownerID,
             ).config(distinct=True).order_by(Product.title)
 
         # We only want Product - the other tables are just to populate

=== modified file 'lib/lp/scripts/utilities/importfascist.py'
--- lib/lp/scripts/utilities/importfascist.py	2009-12-24 06:33:34 +0000
+++ lib/lp/scripts/utilities/importfascist.py	2010-01-10 04:32:20 +0000
@@ -16,6 +16,7 @@
 warnings.filterwarnings('ignore', category=UserWarning, append=True,
                         message=r'Module .*? is being added to sys.path')
 
+
 def text_lines_to_set(text):
     return set(line.strip() for line in text.splitlines() if line.strip())
 
@@ -59,7 +60,11 @@
     'cookielib': set(['domain_match']),
     'email.Utils': set(['mktime_tz']),
     'textwrap': set(['dedent']),
-    'zope.component': set(['adapter', 'provideHandler']),
+    'zope.component': set(
+        ['adapter',
+         'ComponentLookupError',
+         'provideHandler',
+         ]),
     }
 
 
@@ -279,7 +284,7 @@
         sorting_map = {
             DatabaseImportPolicyViolation: database_violations,
             FromStarPolicyViolation: fromstar_violations,
-            NotInModuleAllPolicyViolation: notinall_violations
+            NotInModuleAllPolicyViolation: notinall_violations,
             }
         for error in naughty_imports:
             sorting_map[error.__class__].append(error)

=== modified file 'lib/lp/services/job/runner.py'
--- lib/lp/services/job/runner.py	2009-12-10 19:26:46 +0000
+++ lib/lp/services/job/runner.py	2010-01-10 04:32:20 +0000
@@ -8,7 +8,11 @@
 __metaclass__ = type
 
 
-__all__ = ['JobRunner']
+__all__ = [
+    'BaseRunnableJob',
+    'JobRunner',
+    'JobRunnerProcess',
+    ]
 
 
 import contextlib

=== modified file 'lib/lp/soyuz/browser/sourcepackagerelease.py'
--- lib/lp/soyuz/browser/sourcepackagerelease.py	2009-10-22 12:44:47 +0000
+++ lib/lp/soyuz/browser/sourcepackagerelease.py	2010-01-10 04:32:20 +0000
@@ -5,7 +5,12 @@
 
 __metaclass__ = type
 
+# XXX: JonathanLange 2010-01-06: Many of these functions should be moved to a
+# generic lp.services.text module.
 __all__ = [
+    'extract_bug_numbers',
+    'extract_email_addresses',
+    'linkify_changelog',
     'SourcePackageReleaseView',
     ]
 

=== modified file 'lib/lp/soyuz/scripts/gina/packages.py'
--- lib/lp/soyuz/scripts/gina/packages.py	2009-06-25 04:06:00 +0000
+++ lib/lp/soyuz/scripts/gina/packages.py	2010-01-10 04:32:20 +0000
@@ -12,7 +12,15 @@
 __metaclass__ = type
 
 
-__all__ = ['AbstractPackageData', 'SourcePackageData', 'BinaryPackageData']
+__all__ = [
+    'AbstractPackageData',
+    'BinaryPackageData',
+    'get_dsc_path',
+    'PoolFileNotFound',
+    'prioritymap',
+    'SourcePackageData',
+    'urgencymap',
+    ]
 
 import re
 import os
@@ -140,12 +148,13 @@
 
     return dsc, changelog, copyright
 
+
 def parse_person(val):
     if "," in val:
         # Some emails have ',' like "Adam C. Powell, IV
         # <[e-mail]>". rfc822.parseaddr seems to do not
         # handle this properly, so we munge them here
-        val = val.replace(',','')
+        val = val.replace(',', '')
     return rfc822.parseaddr(val)
 
 
@@ -175,12 +184,6 @@
 
         line = line.split(":")
         algo = int(line[3])
-        if GPGALGOS.has_key(algo):
-            algochar = GPGALGOS[algo]
-        else:
-            algochar = "?" % algo
-        # STRIPPED GPGID Support by cprov 20041004
-        #          id = line[2] + algochar + "/" + line[4][-8:]
         id = line[4][-8:]
         algorithm = algo
         keysize = line[2]
@@ -380,7 +383,6 @@
 
         AbstractPackageData.__init__(self)
 
-
     def do_package(self, archive_root):
         """Get the Changelog and urgency from the package on archive.
 
@@ -397,7 +399,7 @@
         self.changelog = None
         if changelog and changelog[0]:
             cldata = changelog[0]
-            if cldata.has_key("changes"):
+            if 'changes' in cldata:
                 if cldata["package"] != self.package:
                     log.warn("Changelog package %s differs from %s" %
                              (cldata["package"], self.package))

=== modified file 'lib/lp/translations/scripts/po_import.py'
--- lib/lp/translations/scripts/po_import.py	2010-01-06 12:18:25 +0000
+++ lib/lp/translations/scripts/po_import.py	2010-01-10 04:32:20 +0000
@@ -7,13 +7,14 @@
 
 
 __all__ = [
-    'ImportProcess',
+    'TranslationsImport',
     ]
 
 from datetime import datetime, timedelta
 import sys
 
-from pytz import timezone
+import pytz
+
 from zope.component import getUtility
 
 from canonical.config import config
@@ -143,9 +144,7 @@
         """Import entries from the queue."""
         self.logger.debug("Starting the import process.")
 
-        UTC = timezone('UTC')
-
-        self.deadline = datetime.now(UTC) + self.time_to_run
+        self.deadline = datetime.now(pytz.UTC) + self.time_to_run
         translation_import_queue = getUtility(ITranslationImportQueue)
 
         # Get the list of each product or distroseries with pending imports.
@@ -160,7 +159,7 @@
 
         have_work = True
 
-        while have_work and datetime.now(UTC) < self.deadline:
+        while have_work and datetime.now(pytz.UTC) < self.deadline:
             have_work = False
 
             # For fairness, service all queues at least once; don't

=== modified file 'lib/lp/translations/scripts/translations_to_branch.py'
--- lib/lp/translations/scripts/translations_to_branch.py	2010-01-06 12:18:25 +0000
+++ lib/lp/translations/scripts/translations_to_branch.py	2010-01-10 04:32:20 +0000
@@ -9,7 +9,8 @@
 
 import os.path
 from datetime import datetime, timedelta
-from pytz import timezone
+
+import pytz
 
 from zope.component import getUtility
 
@@ -27,9 +28,6 @@
 from lp.services.scripts.base import LaunchpadCronScript
 
 
-UTC = timezone('UTC')
-
-
 class ExportTranslationsToBranch(LaunchpadCronScript):
     """Commit translations to translations_branches where requested."""
 
@@ -69,7 +67,7 @@
         branch = source.translations_branch
         jobsource = getUtility(IRosettaUploadJobSource)
         unfinished_jobs = jobsource.findUnfinishedJobs(
-            branch, since=datetime.now(UTC) - timedelta(days=1))
+            branch, since=datetime.now(pytz.UTC) - timedelta(days=1))
 
         if unfinished_jobs.any():
             raise ConcurrentUpdateError(
@@ -133,11 +131,11 @@
         # The bzr timestamp is a float representing UTC-based seconds
         # since the epoch.  It stores the timezone as well, but we can
         # ignore it here.
-        return datetime.fromtimestamp(revision.timestamp, UTC)
+        return datetime.fromtimestamp(revision.timestamp, pytz.UTC)
 
     def _getLatestTranslationsCommit(self, branch):
         """Get date of last translations commit to `branch`, if any."""
-        cutoff_date = datetime.now(UTC) - self.previous_commit_cutoff_age
+        cutoff_date = datetime.now(pytz.UTC) - self.previous_commit_cutoff_age
 
         revno, current_rev = branch.last_revision_info()
         repository = branch.repository