Launchpad itself

Merge lp:~stevenk/launchpad/fix-copyrights into lp:launchpad

  1. fix-copyrights
  2. Merge into devel
Proposed by Steve Kowalik
Status: Merged
Approved by: William Grant
Approved revision: no longer in the source branch.
Merged at revision: 15415
Proposed branch: lp:~stevenk/launchpad/fix-copyrights
Merge into: lp:launchpad
Diff against target: 1124 lines (+132/-131)
61 files modified
lib/lp/app/widgets/tests/test_datetime.py (+5/-0)
lib/lp/archivepublisher/tests/test_generate_ppa_htaccess.py (+1/-1)
lib/lp/bugs/browser/tests/test_bugtarget_filebug.py (+2/-4)
lib/lp/bugs/browser/tests/test_distribution_upstream_report.py (+1/-1)
lib/lp/bugs/model/bugtaskflat.py (+7/-2)
lib/lp/bugs/model/structuralsubscription.py (+1/-1)
lib/lp/bugs/model/tests/test_bug.py (+2/-2)
lib/lp/bugs/model/tests/test_bugtask.py (+7/-7)
lib/lp/bugs/scripts/tests/test_bugnotification.py (+1/-1)
lib/lp/bugs/tests/test_bugtaskset.py (+3/-6)
lib/lp/code/mail/codehandler.py (+3/-9)
lib/lp/code/mail/tests/test_codehandler.py (+1/-3)
lib/lp/code/model/branchjob.py (+2/-2)
lib/lp/code/model/branchmergeproposaljob.py (+1/-3)
lib/lp/code/model/tests/test_branchjob.py (+2/-4)
lib/lp/codehosting/bzrutils.py (+1/-1)
lib/lp/codehosting/scanner/tests/test_email.py (+3/-3)
lib/lp/codehosting/tests/test_upgrade.py (+3/-0)
lib/lp/registry/browser/distribution.py (+1/-1)
lib/lp/registry/browser/person.py (+1/-3)
lib/lp/registry/browser/tests/test_breadcrumbs.py (+1/-1)
lib/lp/registry/browser/tests/test_distribution.py (+1/-0)
lib/lp/registry/browser/tests/test_person.py (+1/-1)
lib/lp/registry/browser/tests/test_sshkey.py (+1/-1)
lib/lp/registry/model/accesspolicy.py (+1/-1)
lib/lp/registry/model/productjob.py (+7/-8)
lib/lp/registry/model/sharingjob.py (+1/-3)
lib/lp/registry/subscribers.py (+1/-3)
lib/lp/registry/tests/test_distribution.py (+1/-3)
lib/lp/registry/tests/test_productjob.py (+6/-5)
lib/lp/registry/tests/test_sharingjob.py (+2/-3)
lib/lp/registry/tests/test_teammembership.py (+2/-2)
lib/lp/scripts/utilities/js/combo.py (+5/-0)
lib/lp/scripts/utilities/js/jsbuild.py (+3/-0)
lib/lp/scripts/utilities/js/tests/test_combo.py (+5/-0)
lib/lp/services/authserver/tests/test_authserver.py (+1/-1)
lib/lp/services/comments/browser/tests/test_comment.py (+5/-0)
lib/lp/services/database/locking.py (+6/-7)
lib/lp/services/database/stormexpr.py (+1/-1)
lib/lp/services/identity/model/emailaddress.py (+0/-1)
lib/lp/services/job/celeryconfig.py (+2/-1)
lib/lp/services/job/celeryjob.py (+1/-0)
lib/lp/services/job/model/job.py (+0/-1)
lib/lp/services/job/runner.py (+1/-1)
lib/lp/services/job/tests/__init__.py (+1/-1)
lib/lp/services/job/tests/celery_helpers.py (+1/-0)
lib/lp/services/job/tests/test_job.py (+2/-4)
lib/lp/services/job/tests/test_retry_jobs_with_celery.py (+5/-8)
lib/lp/services/messages/tests/test_message.py (+1/-3)
lib/lp/services/testing/tests/test_customresult.py (+2/-1)
lib/lp/services/verification/browser/tests/test_logintoken.py (+1/-1)
lib/lp/services/webapp/publisher.py (+1/-1)
lib/lp/services/webapp/tests/test_error.py (+3/-2)
lib/lp/soyuz/model/packagecopyjob.py (+1/-3)
lib/lp/soyuz/tests/test_packagecopyjob.py (+1/-3)
lib/lp/soyuz/tests/test_person_createppa.py (+1/-0)
lib/lp/testing/fixture.py (+1/-1)
lib/lp/testing/layers.py (+1/-1)
lib/lp/translations/interfaces/translationpackagingjob.py (+5/-0)
lib/lp/translations/tests/test_distroseries_translations_copy.py (+1/-1)
lib/lp/translations/tests/test_pofilestatsjob.py (+1/-3)
To merge this branch: bzr merge lp:~stevenk/launchpad/fix-copyrights
Reviewer Review Type Date Requested Status
William Grant code Approve
Review via email: mp+110229@code.launchpad.net

Commit message

Add copyright headers to files that were missing them, and re-run format-imports over lib/lp.

Description of the change

While working on another branch today I noticed one file that did not have a copyright header. This got me curious enough to search the entire tree for like files -- I found more than I wanted to, so I fixed them. I also ran format-imports across lib/lp.

To post a comment you must log in.
Revision history for this message
William Grant (wgrant) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/lp/app/widgets/tests/test_datetime.py'
--- lib/lp/app/widgets/tests/test_datetime.py 2012-01-01 02:58:52 +0000
+++ lib/lp/app/widgets/tests/test_datetime.py 2012-06-14 05:34:29 +0000
@@ -1,3 +1,8 @@
1# Copyright 2011-2012 Canonical Ltd. This software is licensed under the
2# GNU Affero General Public License version 3 (see the file LICENSE).
3
4__metaclass__ = type
5
1from datetime import datetime6from datetime import datetime
27
3from zope.app.form.interfaces import ConversionError8from zope.app.form.interfaces import ConversionError
49
=== modified file 'lib/lp/archivepublisher/tests/test_generate_ppa_htaccess.py'
--- lib/lp/archivepublisher/tests/test_generate_ppa_htaccess.py 2012-05-31 12:11:19 +0000
+++ lib/lp/archivepublisher/tests/test_generate_ppa_htaccess.py 2012-06-14 05:34:29 +0000
@@ -34,12 +34,12 @@
34from lp.services.config import config34from lp.services.config import config
35from lp.services.log.logger import BufferLogger35from lp.services.log.logger import BufferLogger
36from lp.services.mail import stub36from lp.services.mail import stub
37from lp.services.scripts.interfaces.scriptactivity import IScriptActivitySet
38from lp.services.osutils import (37from lp.services.osutils import (
39 ensure_directory_exists,38 ensure_directory_exists,
40 remove_if_exists,39 remove_if_exists,
41 write_file,40 write_file,
42 )41 )
42from lp.services.scripts.interfaces.scriptactivity import IScriptActivitySet
43from lp.soyuz.enums import (43from lp.soyuz.enums import (
44 ArchiveStatus,44 ArchiveStatus,
45 ArchiveSubscriberStatus,45 ArchiveSubscriberStatus,
4646
=== modified file 'lib/lp/bugs/browser/tests/test_bugtarget_filebug.py'
--- lib/lp/bugs/browser/tests/test_bugtarget_filebug.py 2012-06-07 12:17:48 +0000
+++ lib/lp/bugs/browser/tests/test_bugtarget_filebug.py 2012-06-14 05:34:29 +0000
@@ -5,6 +5,7 @@
55
66
7from BeautifulSoup import BeautifulSoup7from BeautifulSoup import BeautifulSoup
8from lazr.restful.interfaces import IJSONRequestCache
8import transaction9import transaction
9from zope.component import getUtility10from zope.component import getUtility
10from zope.schema.interfaces import (11from zope.schema.interfaces import (
@@ -13,10 +14,7 @@
13 )14 )
14from zope.security.proxy import removeSecurityProxy15from zope.security.proxy import removeSecurityProxy
1516
16from lazr.restful.interfaces import IJSONRequestCache17from lp.bugs.browser.bugtarget import FileBugViewBase
17from lp.bugs.browser.bugtarget import (
18 FileBugViewBase,
19 )
20from lp.bugs.interfaces.bug import (18from lp.bugs.interfaces.bug import (
21 IBugAddForm,19 IBugAddForm,
22 IBugSet,20 IBugSet,
2321
=== modified file 'lib/lp/bugs/browser/tests/test_distribution_upstream_report.py'
--- lib/lp/bugs/browser/tests/test_distribution_upstream_report.py 2012-05-25 19:58:27 +0000
+++ lib/lp/bugs/browser/tests/test_distribution_upstream_report.py 2012-06-14 05:34:29 +0000
@@ -30,8 +30,8 @@
30 LaunchpadFunctionalLayer,30 LaunchpadFunctionalLayer,
31 )31 )
32from lp.testing.views import (32from lp.testing.views import (
33 create_initialized_view,
33 create_view,34 create_view,
34 create_initialized_view,
35 )35 )
3636
3737
3838
=== modified file 'lib/lp/bugs/model/bugtaskflat.py'
--- lib/lp/bugs/model/bugtaskflat.py 2012-05-07 07:43:07 +0000
+++ lib/lp/bugs/model/bugtaskflat.py 2012-06-14 05:34:29 +0000
@@ -1,3 +1,8 @@
1# Copyright 2012 Canonical Ltd. This software is licensed under the
2# GNU Affero General Public License version 3 (see the file LICENSE).
3
4__metaclass__ = type
5
1from storm.locals import (6from storm.locals import (
2 Bool,7 Bool,
3 DateTime,8 DateTime,
@@ -6,13 +11,13 @@
6 Storm,11 Storm,
7 )12 )
813
9from lp.registry.enums import InformationType
10from lp.services.database.enumcol import EnumCol
11from lp.bugs.interfaces.bugtask import (14from lp.bugs.interfaces.bugtask import (
12 BugTaskImportance,15 BugTaskImportance,
13 BugTaskStatus,16 BugTaskStatus,
14 BugTaskStatusSearch,17 BugTaskStatusSearch,
15 )18 )
19from lp.registry.enums import InformationType
20from lp.services.database.enumcol import EnumCol
1621
1722
18class BugTaskFlat(Storm):23class BugTaskFlat(Storm):
1924
=== modified file 'lib/lp/bugs/model/structuralsubscription.py'
--- lib/lp/bugs/model/structuralsubscription.py 2012-05-03 11:58:01 +0000
+++ lib/lp/bugs/model/structuralsubscription.py 2012-06-14 05:34:29 +0000
@@ -83,12 +83,12 @@
83from lp.services.database.constants import UTC_NOW83from lp.services.database.constants import UTC_NOW
84from lp.services.database.lpstorm import IStore84from lp.services.database.lpstorm import IStore
85from lp.services.database.sqlbase import quote85from lp.services.database.sqlbase import quote
86from lp.services.propertycache import cachedproperty
87from lp.services.database.stormexpr import (86from lp.services.database.stormexpr import (
88 ArrayAgg,87 ArrayAgg,
89 ArrayContains,88 ArrayContains,
90 ArrayIntersects,89 ArrayIntersects,
91 )90 )
91from lp.services.propertycache import cachedproperty
9292
9393
94class StructuralSubscription(Storm):94class StructuralSubscription(Storm):
9595
=== modified file 'lib/lp/bugs/model/tests/test_bug.py'
--- lib/lp/bugs/model/tests/test_bug.py 2012-06-04 09:41:48 +0000
+++ lib/lp/bugs/model/tests/test_bug.py 2012-06-14 05:34:29 +0000
@@ -30,12 +30,12 @@
30 BugSubscriptionInfo,30 BugSubscriptionInfo,
31 )31 )
32from lp.bugs.model.bugnotification import BugNotificationRecipient32from lp.bugs.model.bugnotification import BugNotificationRecipient
33from lp.registry.enums import InformationType
33from lp.registry.interfaces.accesspolicy import (34from lp.registry.interfaces.accesspolicy import (
34 IAccessArtifactSource,35 IAccessArtifactSource,
36 IAccessPolicyArtifactSource,
35 IAccessPolicySource,37 IAccessPolicySource,
36 IAccessPolicyArtifactSource,
37 )38 )
38from lp.registry.enums import InformationType
39from lp.registry.interfaces.person import PersonVisibility39from lp.registry.interfaces.person import PersonVisibility
40from lp.registry.tests.test_accesspolicy import get_policies_for_artifact40from lp.registry.tests.test_accesspolicy import get_policies_for_artifact
41from lp.testing import (41from lp.testing import (
4242
=== modified file 'lib/lp/bugs/model/tests/test_bugtask.py'
--- lib/lp/bugs/model/tests/test_bugtask.py 2012-06-07 05:59:10 +0000
+++ lib/lp/bugs/model/tests/test_bugtask.py 2012-06-14 05:34:29 +0000
@@ -61,7 +61,8 @@
61 )61 )
62from lp.bugs.model.tests.test_bug import LEGACY_ACCESS_TRIGGERS62from lp.bugs.model.tests.test_bug import LEGACY_ACCESS_TRIGGERS
63from lp.bugs.scripts.bugtasktargetnamecaches import (63from lp.bugs.scripts.bugtasktargetnamecaches import (
64 BugTaskTargetNameCacheUpdater)64 BugTaskTargetNameCacheUpdater,
65 )
65from lp.bugs.tests.bug import create_old_bug66from lp.bugs.tests.bug import create_old_bug
66from lp.hardwaredb.interfaces.hwdb import (67from lp.hardwaredb.interfaces.hwdb import (
67 HWBus,68 HWBus,
@@ -69,16 +70,15 @@
69 )70 )
70from lp.registry.enums import InformationType71from lp.registry.enums import InformationType
71from lp.registry.interfaces.accesspolicy import (72from lp.registry.interfaces.accesspolicy import (
73 IAccessArtifactGrantSource,
74 IAccessArtifactSource,
72 IAccessPolicyGrantSource,75 IAccessPolicyGrantSource,
73 IAccessPolicySource,76 IAccessPolicySource,
74 IAccessArtifactGrantSource,
75 IAccessArtifactSource,
76 )77 )
77from lp.registry.interfaces.distribution import IDistributionSet78from lp.registry.interfaces.distribution import IDistributionSet
78from lp.registry.interfaces.distributionsourcepackage import (79from lp.registry.interfaces.distributionsourcepackage import (
79 IDistributionSourcePackage80 IDistributionSourcePackage,
80)81 )
81
82from lp.registry.interfaces.distroseries import IDistroSeriesSet82from lp.registry.interfaces.distroseries import IDistroSeriesSet
83from lp.registry.interfaces.person import (83from lp.registry.interfaces.person import (
84 IPerson,84 IPerson,
@@ -92,8 +92,8 @@
92from lp.registry.tests.test_accesspolicy import get_policies_for_artifact92from lp.registry.tests.test_accesspolicy import get_policies_for_artifact
93from lp.services.database.sqlbase import (93from lp.services.database.sqlbase import (
94 convert_storm_clause_to_string,94 convert_storm_clause_to_string,
95 flush_database_caches,
95 flush_database_updates,96 flush_database_updates,
96 flush_database_caches,
97 )97 )
98from lp.services.features.testing import FeatureFixture98from lp.services.features.testing import FeatureFixture
99from lp.services.job.tests import block_on_job99from lp.services.job.tests import block_on_job
100100
=== modified file 'lib/lp/bugs/scripts/tests/test_bugnotification.py'
--- lib/lp/bugs/scripts/tests/test_bugnotification.py 2012-05-08 17:04:43 +0000
+++ lib/lp/bugs/scripts/tests/test_bugnotification.py 2012-06-14 05:34:29 +0000
@@ -4,13 +4,13 @@
44
5__metaclass__ = type5__metaclass__ = type
66
7import StringIO
8from datetime import (7from datetime import (
9 datetime,8 datetime,
10 timedelta,9 timedelta,
11 )10 )
12import logging11import logging
13import re12import re
13import StringIO
14import unittest14import unittest
1515
16import pytz16import pytz
1717
=== modified file 'lib/lp/bugs/tests/test_bugtaskset.py'
--- lib/lp/bugs/tests/test_bugtaskset.py 2012-05-14 20:19:39 +0000
+++ lib/lp/bugs/tests/test_bugtaskset.py 2012-06-14 05:34:29 +0000
@@ -6,12 +6,9 @@
6__metaclass__ = type6__metaclass__ = type
77
8from zope.component import getUtility8from zope.component import getUtility
9from lp.bugs.interfaces.bugtask import (9
10 IBugTaskSet,10from lp.bugs.interfaces.bug import IBugSet
11 )11from lp.bugs.interfaces.bugtask import IBugTaskSet
12from lp.bugs.interfaces.bug import (
13 IBugSet,
14 )
15from lp.registry.interfaces.person import IPersonSet12from lp.registry.interfaces.person import IPersonSet
16from lp.registry.interfaces.product import IProductSet13from lp.registry.interfaces.product import IProductSet
17from lp.services.webapp.interfaces import ILaunchBag14from lp.services.webapp.interfaces import ILaunchBag
1815
=== modified file 'lib/lp/code/mail/codehandler.py'
--- lib/lp/code/mail/codehandler.py 2012-04-27 18:50:49 +0000
+++ lib/lp/code/mail/codehandler.py 2012-06-14 05:34:29 +0000
@@ -14,15 +14,9 @@
14from zope.interface import implements14from zope.interface import implements
15from zope.security.interfaces import Unauthorized15from zope.security.interfaces import Unauthorized
1616
17from lp.code.enums import (17from lp.code.enums import CodeReviewVote
18 CodeReviewVote,18from lp.code.errors import UserNotBranchReviewer
19 )19from lp.code.interfaces.branchmergeproposal import IBranchMergeProposalGetter
20from lp.code.errors import (
21 UserNotBranchReviewer,
22 )
23from lp.code.interfaces.branchmergeproposal import (
24 IBranchMergeProposalGetter,
25 )
26from lp.services.config import config20from lp.services.config import config
27from lp.services.mail.commands import (21from lp.services.mail.commands import (
28 EmailCommand,22 EmailCommand,
2923
=== modified file 'lib/lp/code/mail/tests/test_codehandler.py'
--- lib/lp/code/mail/tests/test_codehandler.py 2012-04-27 19:03:32 +0000
+++ lib/lp/code/mail/tests/test_codehandler.py 2012-06-14 05:34:29 +0000
@@ -35,9 +35,7 @@
35from lp.code.tests.helpers import make_merge_proposal_without_reviewers35from lp.code.tests.helpers import make_merge_proposal_without_reviewers
36from lp.services.config import config36from lp.services.config import config
37from lp.services.mail.handlers import mail_handlers37from lp.services.mail.handlers import mail_handlers
38from lp.services.mail.interfaces import (38from lp.services.mail.interfaces import EmailProcessingError
39 EmailProcessingError,
40 )
41from lp.services.messages.model.message import MessageSet39from lp.services.messages.model.message import MessageSet
42from lp.services.webapp.authorization import LaunchpadSecurityPolicy40from lp.services.webapp.authorization import LaunchpadSecurityPolicy
43from lp.testing import (41from lp.testing import (
4442
=== modified file 'lib/lp/code/model/branchjob.py'
--- lib/lp/code/model/branchjob.py 2012-04-19 18:59:21 +0000
+++ lib/lp/code/model/branchjob.py 2012-06-14 05:34:29 +0000
@@ -94,13 +94,13 @@
94from lp.scripts.helpers import TransactionFreeOperation94from lp.scripts.helpers import TransactionFreeOperation
95from lp.services.config import config95from lp.services.config import config
96from lp.services.database.enumcol import EnumCol96from lp.services.database.enumcol import EnumCol
97from lp.services.database.lpstorm import IStore
98from lp.services.database.sqlbase import SQLBase
99from lp.services.database.locking import (97from lp.services.database.locking import (
100 AdvisoryLockHeld,98 AdvisoryLockHeld,
101 LockType,99 LockType,
102 try_advisory_lock,100 try_advisory_lock,
103 )101 )
102from lp.services.database.lpstorm import IStore
103from lp.services.database.sqlbase import SQLBase
104from lp.services.job.interfaces.job import JobStatus104from lp.services.job.interfaces.job import JobStatus
105from lp.services.job.model.job import (105from lp.services.job.model.job import (
106 EnumeratedSubclass,106 EnumeratedSubclass,
107107
=== modified file 'lib/lp/code/model/branchmergeproposaljob.py'
--- lib/lp/code/model/branchmergeproposaljob.py 2012-04-27 19:03:32 +0000
+++ lib/lp/code/model/branchmergeproposaljob.py 2012-06-14 05:34:29 +0000
@@ -85,9 +85,7 @@
85from lp.code.model.branchmergeproposal import BranchMergeProposal85from lp.code.model.branchmergeproposal import BranchMergeProposal
86from lp.code.model.diff import PreviewDiff86from lp.code.model.diff import PreviewDiff
87from lp.codehosting.bzrutils import server87from lp.codehosting.bzrutils import server
88from lp.codehosting.vfs import (88from lp.codehosting.vfs import get_ro_server
89 get_ro_server,
90 )
91from lp.registry.interfaces.person import IPersonSet89from lp.registry.interfaces.person import IPersonSet
92from lp.services.config import config90from lp.services.config import config
93from lp.services.database.enumcol import EnumCol91from lp.services.database.enumcol import EnumCol
9492
=== modified file 'lib/lp/code/model/tests/test_branchjob.py'
--- lib/lp/code/model/tests/test_branchjob.py 2012-04-26 17:18:47 +0000
+++ lib/lp/code/model/tests/test_branchjob.py 2012-06-14 05:34:29 +0000
@@ -61,8 +61,8 @@
61 )61 )
62from lp.code.model.branchrevision import BranchRevision62from lp.code.model.branchrevision import BranchRevision
63from lp.code.model.directbranchcommit import DirectBranchCommit63from lp.code.model.directbranchcommit import DirectBranchCommit
64from lp.code.model.revision import RevisionSet
64from lp.code.model.tests.test_branch import create_knit65from lp.code.model.tests.test_branch import create_knit
65from lp.code.model.revision import RevisionSet
66from lp.codehosting.vfs import branch_id_to_path66from lp.codehosting.vfs import branch_id_to_path
67from lp.scripts.helpers import TransactionFreeOperation67from lp.scripts.helpers import TransactionFreeOperation
68from lp.services.config import config68from lp.services.config import config
@@ -73,9 +73,7 @@
73from lp.services.job.interfaces.job import JobStatus73from lp.services.job.interfaces.job import JobStatus
74from lp.services.job.model.job import Job74from lp.services.job.model.job import Job
75from lp.services.job.runner import JobRunner75from lp.services.job.runner import JobRunner
76from lp.services.job.tests import (76from lp.services.job.tests import block_on_job
77 block_on_job,
78 )
79from lp.services.osutils import override_environ77from lp.services.osutils import override_environ
80from lp.services.webapp import canonical_url78from lp.services.webapp import canonical_url
81from lp.testing import (79from lp.testing import (
8280
=== modified file 'lib/lp/codehosting/bzrutils.py'
--- lib/lp/codehosting/bzrutils.py 2012-03-22 16:20:58 +0000
+++ lib/lp/codehosting/bzrutils.py 2012-06-14 05:34:29 +0000
@@ -34,9 +34,9 @@
34 )34 )
35from bzrlib.errors import (35from bzrlib.errors import (
36 NotStacked,36 NotStacked,
37 UnsupportedProtocol,
38 UnstackableBranchFormat,37 UnstackableBranchFormat,
39 UnstackableRepositoryFormat,38 UnstackableRepositoryFormat,
39 UnsupportedProtocol,
40 )40 )
41from bzrlib.remote import (41from bzrlib.remote import (
42 RemoteBranch,42 RemoteBranch,
4343
=== modified file 'lib/lp/codehosting/scanner/tests/test_email.py'
--- lib/lp/codehosting/scanner/tests/test_email.py 2012-04-24 18:36:17 +0000
+++ lib/lp/codehosting/scanner/tests/test_email.py 2012-06-14 05:34:29 +0000
@@ -6,9 +6,9 @@
6__metaclass__ = type6__metaclass__ = type
77
8import email8import email
9import os
910
10from bzrlib.uncommit import uncommit11from bzrlib.uncommit import uncommit
11import os
12from zope.component import getUtility12from zope.component import getUtility
13from zope.event import notify13from zope.event import notify
1414
@@ -22,18 +22,18 @@
22 IRevisionsAddedJobSource,22 IRevisionsAddedJobSource,
23 )23 )
24from lp.code.model.branchjob import RevisionMailJob24from lp.code.model.branchjob import RevisionMailJob
25from lp.codehosting.scanner import events
25from lp.codehosting.scanner.bzrsync import BzrSync26from lp.codehosting.scanner.bzrsync import BzrSync
26from lp.codehosting.scanner import events
27from lp.codehosting.scanner.tests.test_bzrsync import BzrSyncTestCase27from lp.codehosting.scanner.tests.test_bzrsync import BzrSyncTestCase
28from lp.registry.interfaces.person import IPersonSet28from lp.registry.interfaces.person import IPersonSet
29from lp.services.config import config29from lp.services.config import config
30from lp.services.features.testing import FeatureFixture30from lp.services.features.testing import FeatureFixture
31from lp.services.job.runner import JobRunner31from lp.services.job.runner import JobRunner
32from lp.services.mail import stub
33from lp.services.job.tests import (32from lp.services.job.tests import (
34 block_on_job,33 block_on_job,
35 pop_remote_notifications,34 pop_remote_notifications,
36 )35 )
36from lp.services.mail import stub
37from lp.testing import TestCaseWithFactory37from lp.testing import TestCaseWithFactory
38from lp.testing.dbuser import switch_dbuser38from lp.testing.dbuser import switch_dbuser
39from lp.testing.layers import (39from lp.testing.layers import (
4040
=== modified file 'lib/lp/codehosting/tests/test_upgrade.py'
--- lib/lp/codehosting/tests/test_upgrade.py 2012-03-26 22:45:24 +0000
+++ lib/lp/codehosting/tests/test_upgrade.py 2012-06-14 05:34:29 +0000
@@ -1,3 +1,6 @@
1# Copyright 2012 Canonical Ltd. This software is licensed under the
2# GNU Affero General Public License version 3 (see the file LICENSE).
3
1__metaclass__ = type4__metaclass__ = type
25
36
47
=== modified file 'lib/lp/registry/browser/distribution.py'
--- lib/lp/registry/browser/distribution.py 2012-06-05 11:41:23 +0000
+++ lib/lp/registry/browser/distribution.py 2012-06-14 05:34:29 +0000
@@ -57,12 +57,12 @@
57 QuestionTargetFacetMixin,57 QuestionTargetFacetMixin,
58 QuestionTargetTraversalMixin,58 QuestionTargetTraversalMixin,
59 )59 )
60from lp.app.browser.lazrjs import InlinePersonEditPickerWidget
61from lp.app.browser.launchpadform import (60from lp.app.browser.launchpadform import (
62 action,61 action,
63 custom_widget,62 custom_widget,
64 LaunchpadFormView,63 LaunchpadFormView,
65 )64 )
65from lp.app.browser.lazrjs import InlinePersonEditPickerWidget
66from lp.app.browser.tales import format_link66from lp.app.browser.tales import format_link
67from lp.app.errors import NotFoundError67from lp.app.errors import NotFoundError
68from lp.app.widgets.image import ImageChangeWidget68from lp.app.widgets.image import ImageChangeWidget
6969
=== modified file 'lib/lp/registry/browser/person.py'
--- lib/lp/registry/browser/person.py 2012-06-12 16:25:42 +0000
+++ lib/lp/registry/browser/person.py 2012-06-14 05:34:29 +0000
@@ -147,9 +147,7 @@
147 LaunchpadRadioWidget,147 LaunchpadRadioWidget,
148 LaunchpadRadioWidgetWithDescription,148 LaunchpadRadioWidgetWithDescription,
149 )149 )
150from lp.blueprints.enums import (150from lp.blueprints.enums import SpecificationWorkItemStatus
151 SpecificationWorkItemStatus,
152 )
153from lp.bugs.interfaces.bugtask import (151from lp.bugs.interfaces.bugtask import (
154 BugTaskSearchParams,152 BugTaskSearchParams,
155 BugTaskStatus,153 BugTaskStatus,
156154
=== modified file 'lib/lp/registry/browser/tests/test_breadcrumbs.py'
--- lib/lp/registry/browser/tests/test_breadcrumbs.py 2012-04-27 19:52:37 +0000
+++ lib/lp/registry/browser/tests/test_breadcrumbs.py 2012-06-14 05:34:29 +0000
@@ -6,10 +6,10 @@
6from zope.component import getUtility6from zope.component import getUtility
77
8from lp.app.interfaces.launchpad import ILaunchpadCelebrities8from lp.app.interfaces.launchpad import ILaunchpadCelebrities
9from lp.registry.browser.tests.test_pillar_sharing import SharingBaseTestCase
9from lp.services.webapp.publisher import canonical_url10from lp.services.webapp.publisher import canonical_url
10from lp.testing import login_person11from lp.testing import login_person
11from lp.testing.breadcrumbs import BaseBreadcrumbTestCase12from lp.testing.breadcrumbs import BaseBreadcrumbTestCase
12from lp.registry.browser.tests.test_pillar_sharing import SharingBaseTestCase
1313
1414
15class TestPillarSharingBreadcrumb(BaseBreadcrumbTestCase, SharingBaseTestCase):15class TestPillarSharingBreadcrumb(BaseBreadcrumbTestCase, SharingBaseTestCase):
1616
=== modified file 'lib/lp/registry/browser/tests/test_distribution.py'
--- lib/lp/registry/browser/tests/test_distribution.py 2012-06-04 16:13:51 +0000
+++ lib/lp/registry/browser/tests/test_distribution.py 2012-06-14 05:34:29 +0000
@@ -1,3 +1,4 @@
1# Copyright 2011-2012 Canonical Ltd. This software is licensed under the
1# GNU Affero General Public License version 3 (see the file LICENSE).2# GNU Affero General Public License version 3 (see the file LICENSE).
23
3"""Tests for Distribution page."""4"""Tests for Distribution page."""
45
=== modified file 'lib/lp/registry/browser/tests/test_person.py'
--- lib/lp/registry/browser/tests/test_person.py 2012-05-01 06:49:04 +0000
+++ lib/lp/registry/browser/tests/test_person.py 2012-06-14 05:34:29 +0000
@@ -3,8 +3,8 @@
33
4__metaclass__ = type4__metaclass__ = type
55
6import doctest
6import email7import email
7import doctest
8from textwrap import dedent8from textwrap import dedent
99
10import soupmatchers10import soupmatchers
1111
=== modified file 'lib/lp/registry/browser/tests/test_sshkey.py'
--- lib/lp/registry/browser/tests/test_sshkey.py 2012-04-11 14:40:02 +0000
+++ lib/lp/registry/browser/tests/test_sshkey.py 2012-06-14 05:34:29 +0000
@@ -10,8 +10,8 @@
10from lp.registry.interfaces.ssh import ISSHKeySet10from lp.registry.interfaces.ssh import ISSHKeySet
11from lp.services.webapp import canonical_url11from lp.services.webapp import canonical_url
12from lp.testing import (12from lp.testing import (
13 person_logged_in,
13 TestCaseWithFactory,14 TestCaseWithFactory,
14 person_logged_in,
15 )15 )
16from lp.testing.layers import DatabaseFunctionalLayer16from lp.testing.layers import DatabaseFunctionalLayer
17from lp.testing.pages import (17from lp.testing.pages import (
1818
=== modified file 'lib/lp/registry/model/accesspolicy.py'
--- lib/lp/registry/model/accesspolicy.py 2012-06-05 02:03:44 +0000
+++ lib/lp/registry/model/accesspolicy.py 2012-06-14 05:34:29 +0000
@@ -41,9 +41,9 @@
41 )41 )
42from lp.registry.interfaces.accesspolicy import (42from lp.registry.interfaces.accesspolicy import (
43 IAccessArtifact,43 IAccessArtifact,
44 IAccessArtifactSource,
45 IAccessArtifactGrant,44 IAccessArtifactGrant,
46 IAccessArtifactGrantSource,45 IAccessArtifactGrantSource,
46 IAccessArtifactSource,
47 IAccessPolicy,47 IAccessPolicy,
48 IAccessPolicyArtifact,48 IAccessPolicyArtifact,
49 IAccessPolicyArtifactSource,49 IAccessPolicyArtifactSource,
5050
=== modified file 'lib/lp/registry/model/productjob.py'
--- lib/lp/registry/model/productjob.py 2012-06-08 17:11:46 +0000
+++ lib/lp/registry/model/productjob.py 2012-06-14 05:34:29 +0000
@@ -16,8 +16,9 @@
16 datetime,16 datetime,
17 timedelta,17 timedelta,
18 )18 )
19
20from lazr.delegates import delegates
19from pytz import utc21from pytz import utc
20from lazr.delegates import delegates
21import simplejson22import simplejson
22from storm.expr import (23from storm.expr import (
23 And,24 And,
@@ -44,12 +45,12 @@
44 License,45 License,
45 )46 )
46from lp.registry.interfaces.productjob import (47from lp.registry.interfaces.productjob import (
48 ICommercialExpiredJob,
49 ICommercialExpiredJobSource,
47 IProductJob,50 IProductJob,
48 IProductJobSource,51 IProductJobSource,
49 IProductNotificationJob,52 IProductNotificationJob,
50 IProductNotificationJobSource,53 IProductNotificationJobSource,
51 ICommercialExpiredJob,
52 ICommercialExpiredJobSource,
53 ISevenDayCommercialExpirationJob,54 ISevenDayCommercialExpirationJob,
54 ISevenDayCommercialExpirationJobSource,55 ISevenDayCommercialExpirationJobSource,
55 IThirtyDayCommercialExpirationJob,56 IThirtyDayCommercialExpirationJob,
@@ -65,19 +66,17 @@
65 IStore,66 IStore,
66 )67 )
67from lp.services.database.stormbase import StormBase68from lp.services.database.stormbase import StormBase
68from lp.services.propertycache import cachedproperty
69from lp.services.job.model.job import Job69from lp.services.job.model.job import Job
70from lp.services.job.runner import BaseRunnableJob70from lp.services.job.runner import BaseRunnableJob
71from lp.services.mail.helpers import (71from lp.services.mail.helpers import get_email_template
72 get_email_template,72from lp.services.mail.mailwrapper import MailWrapper
73 )
74from lp.services.mail.notificationrecipientset import NotificationRecipientSet73from lp.services.mail.notificationrecipientset import NotificationRecipientSet
75from lp.services.mail.mailwrapper import MailWrapper
76from lp.services.mail.sendmail import (74from lp.services.mail.sendmail import (
77 format_address,75 format_address,
78 format_address_for_person,76 format_address_for_person,
79 simple_sendmail,77 simple_sendmail,
80 )78 )
79from lp.services.propertycache import cachedproperty
81from lp.services.webapp.publisher import canonical_url80from lp.services.webapp.publisher import canonical_url
8281
8382
8483
=== modified file 'lib/lp/registry/model/sharingjob.py'
--- lib/lp/registry/model/sharingjob.py 2012-05-24 01:43:42 +0000
+++ lib/lp/registry/model/sharingjob.py 2012-06-14 05:34:29 +0000
@@ -78,9 +78,7 @@
78 EnumeratedSubclass,78 EnumeratedSubclass,
79 Job,79 Job,
80 )80 )
81from lp.services.job.runner import (81from lp.services.job.runner import BaseRunnableJob
82 BaseRunnableJob,
83 )
84from lp.services.mail.sendmail import format_address_for_person82from lp.services.mail.sendmail import format_address_for_person
85from lp.services.webapp import errorlog83from lp.services.webapp import errorlog
8684
8785
=== modified file 'lib/lp/registry/subscribers.py'
--- lib/lp/registry/subscribers.py 2012-05-25 21:18:48 +0000
+++ lib/lp/registry/subscribers.py 2012-06-14 05:34:29 +0000
@@ -14,9 +14,7 @@
14import pytz14import pytz
15from zope.security.proxy import removeSecurityProxy15from zope.security.proxy import removeSecurityProxy
1616
17from lp.registry.interfaces.person import (17from lp.registry.interfaces.person import IPerson
18 IPerson,
19 )
20from lp.registry.interfaces.product import License18from lp.registry.interfaces.product import License
21from lp.services.config import config19from lp.services.config import config
22from lp.services.mail.helpers import get_email_template20from lp.services.mail.helpers import get_email_template
2321
=== modified file 'lib/lp/registry/tests/test_distribution.py'
--- lib/lp/registry/tests/test_distribution.py 2012-06-06 16:05:23 +0000
+++ lib/lp/registry/tests/test_distribution.py 2012-06-14 05:34:29 +0000
@@ -43,9 +43,7 @@
43 OPEN_TEAM_POLICY,43 OPEN_TEAM_POLICY,
44 )44 )
45from lp.registry.interfaces.series import SeriesStatus45from lp.registry.interfaces.series import SeriesStatus
46from lp.registry.tests.test_distroseries import (46from lp.registry.tests.test_distroseries import CurrentSourceReleasesMixin
47 CurrentSourceReleasesMixin,
48 )
49from lp.services.database.constants import UTC_NOW47from lp.services.database.constants import UTC_NOW
50from lp.services.propertycache import get_property_cache48from lp.services.propertycache import get_property_cache
51from lp.services.webapp import canonical_url49from lp.services.webapp import canonical_url
5250
=== modified file 'lib/lp/registry/tests/test_productjob.py'
--- lib/lp/registry/tests/test_productjob.py 2012-06-08 17:29:07 +0000
+++ lib/lp/registry/tests/test_productjob.py 2012-06-14 05:34:29 +0000
@@ -9,8 +9,9 @@
9 datetime,9 datetime,
10 timedelta,10 timedelta,
11 )11 )
12
13import pytz
12import transaction14import transaction
13import pytz
14from zope.component import getUtility15from zope.component import getUtility
15from zope.interface import (16from zope.interface import (
16 classProvides,17 classProvides,
@@ -46,6 +47,10 @@
46 SevenDayCommercialExpirationJob,47 SevenDayCommercialExpirationJob,
47 ThirtyDayCommercialExpirationJob,48 ThirtyDayCommercialExpirationJob,
48 )49 )
50from lp.services.log.logger import BufferLogger
51from lp.services.propertycache import clear_property_cache
52from lp.services.scripts.tests import run_script
53from lp.services.webapp.publisher import canonical_url
49from lp.testing import (54from lp.testing import (
50 person_logged_in,55 person_logged_in,
51 TestCaseWithFactory,56 TestCaseWithFactory,
@@ -56,10 +61,6 @@
56 ZopelessAppServerLayer,61 ZopelessAppServerLayer,
57 )62 )
58from lp.testing.mail_helpers import pop_notifications63from lp.testing.mail_helpers import pop_notifications
59from lp.services.log.logger import BufferLogger
60from lp.services.propertycache import clear_property_cache
61from lp.services.scripts.tests import run_script
62from lp.services.webapp.publisher import canonical_url
6364
6465
65class CommercialHelpers:66class CommercialHelpers:
6667
=== modified file 'lib/lp/registry/tests/test_sharingjob.py'
--- lib/lp/registry/tests/test_sharingjob.py 2012-06-05 02:03:44 +0000
+++ lib/lp/registry/tests/test_sharingjob.py 2012-06-14 05:34:29 +0000
@@ -5,10 +5,9 @@
55
6__metaclass__ = type6__metaclass__ = type
77
8import transaction
9
10from testtools.content import Content8from testtools.content import Content
11from testtools.content_type import UTF8_TEXT9from testtools.content_type import UTF8_TEXT
10import transaction
12from zope.component import getUtility11from zope.component import getUtility
13from zope.security.proxy import removeSecurityProxy12from zope.security.proxy import removeSecurityProxy
1413
@@ -18,8 +17,8 @@
18 )17 )
19from lp.registry.enums import InformationType18from lp.registry.enums import InformationType
20from lp.registry.interfaces.accesspolicy import (19from lp.registry.interfaces.accesspolicy import (
20 IAccessArtifactGrantSource,
21 IAccessArtifactSource,21 IAccessArtifactSource,
22 IAccessArtifactGrantSource,
23 IAccessPolicySource,22 IAccessPolicySource,
24 )23 )
25from lp.registry.interfaces.person import TeamSubscriptionPolicy24from lp.registry.interfaces.person import TeamSubscriptionPolicy
2625
=== modified file 'lib/lp/registry/tests/test_teammembership.py'
--- lib/lp/registry/tests/test_teammembership.py 2012-06-07 05:59:10 +0000
+++ lib/lp/registry/tests/test_teammembership.py 2012-06-14 05:34:29 +0000
@@ -25,8 +25,8 @@
25from lp.app.interfaces.launchpad import ILaunchpadCelebrities25from lp.app.interfaces.launchpad import ILaunchpadCelebrities
26from lp.registry.enums import InformationType26from lp.registry.enums import InformationType
27from lp.registry.interfaces.accesspolicy import (27from lp.registry.interfaces.accesspolicy import (
28 IAccessArtifactGrantSource,
28 IAccessArtifactSource,29 IAccessArtifactSource,
29 IAccessArtifactGrantSource,
30 )30 )
31from lp.registry.interfaces.person import (31from lp.registry.interfaces.person import (
32 IPersonSet,32 IPersonSet,
@@ -59,8 +59,8 @@
59 sqlvalues,59 sqlvalues,
60 )60 )
61from lp.services.features.testing import FeatureFixture61from lp.services.features.testing import FeatureFixture
62from lp.services.job.tests import block_on_job
62from lp.services.log.logger import BufferLogger63from lp.services.log.logger import BufferLogger
63from lp.services.job.tests import block_on_job
64from lp.testing import (64from lp.testing import (
65 login,65 login,
66 login_celebrity,66 login_celebrity,
6767
=== modified file 'lib/lp/scripts/utilities/js/combo.py'
--- lib/lp/scripts/utilities/js/combo.py 2011-12-19 23:38:16 +0000
+++ lib/lp/scripts/utilities/js/combo.py 2012-06-14 05:34:29 +0000
@@ -1,3 +1,8 @@
1# Copyright 2011-2012 Canonical Ltd. This software is licensed under the
2# GNU Affero General Public License version 3 (see the file LICENSE).
3
4__metaclass__ = type
5
1import cgi6import cgi
2import os7import os
3import urlparse8import urlparse
49
=== modified file 'lib/lp/scripts/utilities/js/jsbuild.py'
--- lib/lp/scripts/utilities/js/jsbuild.py 2011-12-19 23:38:16 +0000
+++ lib/lp/scripts/utilities/js/jsbuild.py 2012-06-14 05:34:29 +0000
@@ -1,3 +1,6 @@
1# Copyright 2011-2012 Canonical Ltd. This software is licensed under the
2# GNU Affero General Public License version 3 (see the file LICENSE).
3
1"""build.py - Minifies and creates the JS build directory."""4"""build.py - Minifies and creates the JS build directory."""
25
3__metaclass__ = type6__metaclass__ = type
47
=== modified file 'lib/lp/scripts/utilities/js/tests/test_combo.py'
--- lib/lp/scripts/utilities/js/tests/test_combo.py 2011-12-19 23:38:16 +0000
+++ lib/lp/scripts/utilities/js/tests/test_combo.py 2012-06-14 05:34:29 +0000
@@ -1,3 +1,8 @@
1# Copyright 2011-2012 Canonical Ltd. This software is licensed under the
2# GNU Affero General Public License version 3 (see the file LICENSE).
3
4__metaclass__ = type
5
1import os6import os
2import shutil7import shutil
3import tempfile8import tempfile
49
=== modified file 'lib/lp/services/authserver/tests/test_authserver.py'
--- lib/lp/services/authserver/tests/test_authserver.py 2012-04-11 14:40:02 +0000
+++ lib/lp/services/authserver/tests/test_authserver.py 2012-06-14 05:34:29 +0000
@@ -10,8 +10,8 @@
1010
11from lp.services.authserver.xmlrpc import AuthServerAPIView11from lp.services.authserver.xmlrpc import AuthServerAPIView
12from lp.testing import (12from lp.testing import (
13 person_logged_in,
13 TestCaseWithFactory,14 TestCaseWithFactory,
14 person_logged_in,
15 )15 )
16from lp.testing.layers import DatabaseFunctionalLayer16from lp.testing.layers import DatabaseFunctionalLayer
17from lp.xmlrpc import faults17from lp.xmlrpc import faults
1818
=== modified file 'lib/lp/services/comments/browser/tests/test_comment.py'
--- lib/lp/services/comments/browser/tests/test_comment.py 2012-02-28 04:24:19 +0000
+++ lib/lp/services/comments/browser/tests/test_comment.py 2012-06-14 05:34:29 +0000
@@ -1,3 +1,8 @@
1# Copyright 2012 Canonical Ltd. This software is licensed under the
2# GNU Affero General Public License version 3 (see the file LICENSE).
3
4__metaclass__ = type
5
1from lp.services.comments.browser.comment import CommentBodyDownloadView6from lp.services.comments.browser.comment import CommentBodyDownloadView
2from lp.services.webapp.servers import LaunchpadTestRequest7from lp.services.webapp.servers import LaunchpadTestRequest
3from lp.testing import (8from lp.testing import (
49
=== modified file 'lib/lp/services/database/locking.py'
--- lib/lp/services/database/locking.py 2012-04-20 19:38:28 +0000
+++ lib/lp/services/database/locking.py 2012-06-14 05:34:29 +0000
@@ -1,8 +1,13 @@
1# Copyright 2011 Canonical Ltd. This software is licensed under the1# Copyright 2011-2012 Canonical Ltd. This software is licensed under the
2# GNU Affero General Public License version 3 (see the file LICENSE).2# GNU Affero General Public License version 3 (see the file LICENSE).
33
4__metaclass__ = type4__metaclass__ = type
55
6__all__ = [
7 'AdvisoryLockHeld',
8 'LockType',
9 'try_advisory_lock',
10]
611
7from contextlib import contextmanager12from contextlib import contextmanager
813
@@ -17,12 +22,6 @@
17 TryAdvisoryLock,22 TryAdvisoryLock,
18 )23 )
1924
20__all__ = [
21 'AdvisoryLockHeld',
22 'LockType',
23 'try_advisory_lock',
24]
25
2625
27class AdvisoryLockHeld(Exception):26class AdvisoryLockHeld(Exception):
28 """An attempt to acquire an advisory lock failed; it is already held."""27 """An attempt to acquire an advisory lock failed; it is already held."""
2928
=== modified file 'lib/lp/services/database/stormexpr.py'
--- lib/lp/services/database/stormexpr.py 2012-05-17 08:36:19 +0000
+++ lib/lp/services/database/stormexpr.py 2012-06-14 05:34:29 +0000
@@ -20,8 +20,8 @@
20from storm.expr import (20from storm.expr import (
21 BinaryOper,21 BinaryOper,
22 ComparableExpr,22 ComparableExpr,
23 compile,
23 CompoundOper,24 CompoundOper,
24 compile,
25 EXPR,25 EXPR,
26 Expr,26 Expr,
27 In,27 In,
2828
=== modified file 'lib/lp/services/identity/model/emailaddress.py'
--- lib/lp/services/identity/model/emailaddress.py 2012-04-16 15:38:07 +0000
+++ lib/lp/services/identity/model/emailaddress.py 2012-06-14 05:34:29 +0000
@@ -19,7 +19,6 @@
19 ForeignKey,19 ForeignKey,
20 StringCol,20 StringCol,
21 )21 )
22
23from zope.interface import implements22from zope.interface import implements
2423
25from lp.app.validators.email import valid_email24from lp.app.validators.email import valid_email
2625
=== modified file 'lib/lp/services/job/celeryconfig.py'
--- lib/lp/services/job/celeryconfig.py 2012-05-14 20:33:32 +0000
+++ lib/lp/services/job/celeryconfig.py 2012-06-14 05:34:29 +0000
@@ -1,10 +1,11 @@
1# Copyright 2012 Canonical Ltd. This software is licensed under the1# Copyright 2012 Canonical Ltd. This software is licensed under the
2# GNU Affero General Public License version 3 (see the file LICENSE).2# GNU Affero General Public License version 3 (see the file LICENSE).
33
4import argparse
5from datetime import timedelta4from datetime import timedelta
6import sys5import sys
76
7import argparse
8
8from lp.services.config import config9from lp.services.config import config
910
1011
1112
=== modified file 'lib/lp/services/job/celeryjob.py'
--- lib/lp/services/job/celeryjob.py 2012-05-24 20:04:02 +0000
+++ lib/lp/services/job/celeryjob.py 2012-06-14 05:34:29 +0000
@@ -17,6 +17,7 @@
17from logging import info17from logging import info
18import os18import os
1919
20
20os.environ.setdefault('CELERY_CONFIG_MODULE', 'lp.services.job.celeryconfig')21os.environ.setdefault('CELERY_CONFIG_MODULE', 'lp.services.job.celeryconfig')
21from celery.task import task22from celery.task import task
22from lazr.jobrunner.celerytask import RunJob23from lazr.jobrunner.celerytask import RunJob
2324
=== modified file 'lib/lp/services/job/model/job.py'
--- lib/lp/services/job/model/job.py 2012-05-20 23:49:27 +0000
+++ lib/lp/services/job/model/job.py 2012-06-14 05:34:29 +0000
@@ -18,7 +18,6 @@
18import time18import time
1919
20from lazr.jobrunner.jobrunner import LeaseHeld20from lazr.jobrunner.jobrunner import LeaseHeld
21
22import pytz21import pytz
23from sqlobject import (22from sqlobject import (
24 IntCol,23 IntCol,
2524
=== modified file 'lib/lp/services/job/runner.py'
--- lib/lp/services/job/runner.py 2012-05-18 00:04:30 +0000
+++ lib/lp/services/job/runner.py 2012-06-14 05:34:29 +0000
@@ -19,11 +19,11 @@
1919
20from calendar import timegm20from calendar import timegm
21from collections import defaultdict21from collections import defaultdict
22import contextlib
22from datetime import (23from datetime import (
23 datetime,24 datetime,
24 timedelta,25 timedelta,
25 )26 )
26import contextlib
27import logging27import logging
28import os28import os
29from resource import (29from resource import (
3030
=== modified file 'lib/lp/services/job/tests/__init__.py'
--- lib/lp/services/job/tests/__init__.py 2012-05-14 20:06:58 +0000
+++ lib/lp/services/job/tests/__init__.py 2012-06-14 05:34:29 +0000
@@ -15,8 +15,8 @@
1515
16from testtools.content import text_content16from testtools.content import text_content
1717
18from lp.services.job.runner import BaseRunnableJob
18from lp.testing.fixture import CaptureOops19from lp.testing.fixture import CaptureOops
19from lp.services.job.runner import BaseRunnableJob
2020
2121
22def celeryd(queue, cwd=None):22def celeryd(queue, cwd=None):
2323
=== modified file 'lib/lp/services/job/tests/celery_helpers.py'
--- lib/lp/services/job/tests/celery_helpers.py 2012-04-05 19:05:16 +0000
+++ lib/lp/services/job/tests/celery_helpers.py 2012-06-14 05:34:29 +0000
@@ -7,6 +7,7 @@
77
8# Force the correct celeryconfig to be used.8# Force the correct celeryconfig to be used.
9import lp.services.job.celeryjob9import lp.services.job.celeryjob
10
10# Quiet lint unused import warning.11# Quiet lint unused import warning.
11lp.services.job.celeryjob12lp.services.job.celeryjob
1213
1314
=== modified file 'lib/lp/services/job/tests/test_job.py'
--- lib/lp/services/job/tests/test_job.py 2012-05-14 14:57:15 +0000
+++ lib/lp/services/job/tests/test_job.py 2012-06-14 05:34:29 +0000
@@ -6,15 +6,13 @@
6from datetime import datetime6from datetime import datetime
7import time7import time
88
9from lazr.jobrunner.jobrunner import LeaseHeld
9import pytz10import pytz
10from lazr.jobrunner.jobrunner import LeaseHeld
11from storm.locals import Store11from storm.locals import Store
12from testtools.matchers import Equals12from testtools.matchers import Equals
13import transaction13import transaction
1414
15from lp.code.model.branchmergeproposaljob import (15from lp.code.model.branchmergeproposaljob import CodeReviewCommentEmailJob
16 CodeReviewCommentEmailJob,
17 )
18from lp.services.database.constants import UTC_NOW16from lp.services.database.constants import UTC_NOW
19from lp.services.database.lpstorm import IStore17from lp.services.database.lpstorm import IStore
20from lp.services.job.interfaces.job import (18from lp.services.job.interfaces.job import (
2119
=== modified file 'lib/lp/services/job/tests/test_retry_jobs_with_celery.py'
--- lib/lp/services/job/tests/test_retry_jobs_with_celery.py 2012-06-04 16:15:49 +0000
+++ lib/lp/services/job/tests/test_retry_jobs_with_celery.py 2012-06-14 05:34:29 +0000
@@ -4,14 +4,11 @@
4"""Tests for running jobs via Celery."""4"""Tests for running jobs via Celery."""
55
66
7from datetime import (7from datetime import timedelta
8 timedelta,8from time import sleep
9 )9
10from time import (10from lazr.delegates import delegates
11 sleep,
12 )
13import transaction11import transaction
14from lazr.delegates import delegates
15from zope.interface import implements12from zope.interface import implements
1613
17from lp.services.config import config14from lp.services.config import config
@@ -20,8 +17,8 @@
20from lp.services.job.interfaces.job import (17from lp.services.job.interfaces.job import (
21 IJob,18 IJob,
22 IRunnableJob,19 IRunnableJob,
20 JobStatus,
23 )21 )
24from lp.services.job.interfaces.job import JobStatus
25from lp.services.job.model.job import Job22from lp.services.job.model.job import Job
26from lp.services.job.runner import BaseRunnableJob23from lp.services.job.runner import BaseRunnableJob
27from lp.services.job.tests import block_on_job24from lp.services.job.tests import block_on_job
2825
=== modified file 'lib/lp/services/messages/tests/test_message.py'
--- lib/lp/services/messages/tests/test_message.py 2012-04-27 19:03:32 +0000
+++ lib/lp/services/messages/tests/test_message.py 2012-06-14 05:34:29 +0000
@@ -14,9 +14,7 @@
1414
15import transaction15import transaction
1616
17from lp.services.messages.model.message import (17from lp.services.messages.model.message import MessageSet
18 MessageSet,
19 )
20from lp.testing import (18from lp.testing import (
21 login,19 login,
22 TestCase,20 TestCase,
2321
=== modified file 'lib/lp/services/testing/tests/test_customresult.py'
--- lib/lp/services/testing/tests/test_customresult.py 2012-06-07 10:03:44 +0000
+++ lib/lp/services/testing/tests/test_customresult.py 2012-06-14 05:34:29 +0000
@@ -7,8 +7,9 @@
77
8import string8import string
9import tempfile9import tempfile
10import unittest
11
10from testtools import TestCase12from testtools import TestCase
11import unittest
1213
13from lp.services.testing.customresult import filter_tests14from lp.services.testing.customresult import filter_tests
14from lp.testing.layers import BaseLayer15from lp.testing.layers import BaseLayer
1516
=== modified file 'lib/lp/services/verification/browser/tests/test_logintoken.py'
--- lib/lp/services/verification/browser/tests/test_logintoken.py 2012-04-11 14:40:02 +0000
+++ lib/lp/services/verification/browser/tests/test_logintoken.py 2012-06-14 05:34:29 +0000
@@ -13,8 +13,8 @@
13from lp.services.verification.interfaces.authtoken import LoginTokenType13from lp.services.verification.interfaces.authtoken import LoginTokenType
14from lp.services.verification.interfaces.logintoken import ILoginTokenSet14from lp.services.verification.interfaces.logintoken import ILoginTokenSet
15from lp.testing import (15from lp.testing import (
16 person_logged_in,
16 TestCaseWithFactory,17 TestCaseWithFactory,
17 person_logged_in,
18 )18 )
19from lp.testing.deprecated import LaunchpadFormHarness19from lp.testing.deprecated import LaunchpadFormHarness
20from lp.testing.layers import DatabaseFunctionalLayer20from lp.testing.layers import DatabaseFunctionalLayer
2121
=== modified file 'lib/lp/services/webapp/publisher.py'
--- lib/lp/services/webapp/publisher.py 2012-05-22 17:00:08 +0000
+++ lib/lp/services/webapp/publisher.py 2012-06-14 05:34:29 +0000
@@ -47,12 +47,12 @@
47 queryMultiAdapter,47 queryMultiAdapter,
48 )48 )
49from zope.component.interfaces import ComponentLookupError49from zope.component.interfaces import ComponentLookupError
50from zope.i18nmessageid import Message
50from zope.interface import (51from zope.interface import (
51 directlyProvides,52 directlyProvides,
52 implements,53 implements,
53 )54 )
54from zope.interface.advice import addClassAdvisor55from zope.interface.advice import addClassAdvisor
55from zope.i18nmessageid import Message
56from zope.publisher.interfaces import NotFound56from zope.publisher.interfaces import NotFound
57from zope.publisher.interfaces.browser import (57from zope.publisher.interfaces.browser import (
58 IBrowserPublisher,58 IBrowserPublisher,
5959
=== modified file 'lib/lp/services/webapp/tests/test_error.py'
--- lib/lp/services/webapp/tests/test_error.py 2012-06-12 09:26:39 +0000
+++ lib/lp/services/webapp/tests/test_error.py 2012-06-14 05:34:29 +0000
@@ -5,13 +5,14 @@
55
66
7import httplib7import httplib
8import time
9import urllib2
10
8from storm.exceptions import (11from storm.exceptions import (
9 DisconnectionError,12 DisconnectionError,
10 OperationalError,13 OperationalError,
11 )14 )
12import time
13import transaction15import transaction
14import urllib2
1516
16from lp.services.webapp.error import (17from lp.services.webapp.error import (
17 DisconnectionErrorView,18 DisconnectionErrorView,
1819
=== modified file 'lib/lp/soyuz/model/packagecopyjob.py'
--- lib/lp/soyuz/model/packagecopyjob.py 2012-05-21 07:34:15 +0000
+++ lib/lp/soyuz/model/packagecopyjob.py 2012-06-14 05:34:29 +0000
@@ -49,9 +49,7 @@
49 IStore,49 IStore,
50 )50 )
51from lp.services.database.stormbase import StormBase51from lp.services.database.stormbase import StormBase
52from lp.services.job.interfaces.job import (52from lp.services.job.interfaces.job import JobStatus
53 JobStatus,
54 )
55from lp.services.job.model.job import (53from lp.services.job.model.job import (
56 EnumeratedSubclass,54 EnumeratedSubclass,
57 Job,55 Job,
5856
=== modified file 'lib/lp/soyuz/tests/test_packagecopyjob.py'
--- lib/lp/soyuz/tests/test_packagecopyjob.py 2012-05-21 07:34:15 +0000
+++ lib/lp/soyuz/tests/test_packagecopyjob.py 2012-06-14 05:34:29 +0000
@@ -24,9 +24,7 @@
24from lp.services.config import config24from lp.services.config import config
25from lp.services.database.lpstorm import IStore25from lp.services.database.lpstorm import IStore
26from lp.services.features.testing import FeatureFixture26from lp.services.features.testing import FeatureFixture
27from lp.services.job.interfaces.job import (27from lp.services.job.interfaces.job import JobStatus
28 JobStatus,
29 )
30from lp.services.job.tests import (28from lp.services.job.tests import (
31 block_on_job,29 block_on_job,
32 pop_remote_notifications,30 pop_remote_notifications,
3331
=== modified file 'lib/lp/soyuz/tests/test_person_createppa.py'
--- lib/lp/soyuz/tests/test_person_createppa.py 2012-06-11 09:16:11 +0000
+++ lib/lp/soyuz/tests/test_person_createppa.py 2012-06-14 05:34:29 +0000
@@ -6,6 +6,7 @@
6__metaclass__ = type6__metaclass__ = type
77
8from zope.security.interfaces import Unauthorized8from zope.security.interfaces import Unauthorized
9
9from lp.registry.errors import PPACreationError10from lp.registry.errors import PPACreationError
10from lp.registry.interfaces.person import (11from lp.registry.interfaces.person import (
11 PersonVisibility,12 PersonVisibility,
1213
=== modified file 'lib/lp/testing/fixture.py'
--- lib/lp/testing/fixture.py 2012-05-16 03:56:28 +0000
+++ lib/lp/testing/fixture.py 2012-06-14 05:34:29 +0000
@@ -60,8 +60,8 @@
60from lp.services.webapp.errorlog import ErrorReportEvent60from lp.services.webapp.errorlog import ErrorReportEvent
61from lp.services.webapp.interfaces import (61from lp.services.webapp.interfaces import (
62 DEFAULT_FLAVOR,62 DEFAULT_FLAVOR,
63 IStoreSelector,
63 MAIN_STORE,64 MAIN_STORE,
64 IStoreSelector,
65 )65 )
66from lp.testing.dbuser import dbuser66from lp.testing.dbuser import dbuser
6767
6868
=== modified file 'lib/lp/testing/layers.py'
--- lib/lp/testing/layers.py 2012-04-12 19:34:59 +0000
+++ lib/lp/testing/layers.py 2012-06-14 05:34:29 +0000
@@ -111,10 +111,10 @@
111 ConfigUseFixture,111 ConfigUseFixture,
112 )112 )
113from lp.services.database.sqlbase import session_store113from lp.services.database.sqlbase import session_store
114from lp.services.job.tests import celeryd
115from lp.services.googlesearch.tests.googleserviceharness import (114from lp.services.googlesearch.tests.googleserviceharness import (
116 GoogleServiceTestSetup,115 GoogleServiceTestSetup,
117 )116 )
117from lp.services.job.tests import celeryd
118from lp.services.librarianserver.testing.server import LibrarianServerFixture118from lp.services.librarianserver.testing.server import LibrarianServerFixture
119from lp.services.mail.mailbox import (119from lp.services.mail.mailbox import (
120 IMailBox,120 IMailBox,
121121
=== modified file 'lib/lp/translations/interfaces/translationpackagingjob.py'
--- lib/lp/translations/interfaces/translationpackagingjob.py 2011-12-19 23:38:16 +0000
+++ lib/lp/translations/interfaces/translationpackagingjob.py 2012-06-14 05:34:29 +0000
@@ -1,3 +1,8 @@
1# Copyright 2011-2012 Canonical Ltd. This software is licensed under the
2# GNU Affero General Public License version 3 (see the file LICENSE).
3
4__metaclass__ = type
5
1from lp.services.job.interfaces.job import IJobSource6from lp.services.job.interfaces.job import IJobSource
27
38
49
=== modified file 'lib/lp/translations/tests/test_distroseries_translations_copy.py'
--- lib/lp/translations/tests/test_distroseries_translations_copy.py 2012-05-08 03:10:09 +0000
+++ lib/lp/translations/tests/test_distroseries_translations_copy.py 2012-06-14 05:34:29 +0000
@@ -6,10 +6,10 @@
6__metaclass__ = type6__metaclass__ = type
77
8from lp.services.database.multitablecopy import MultiTableCopy8from lp.services.database.multitablecopy import MultiTableCopy
9from lp.services.log.logger import DevNullLogger
9from lp.testing import TestCaseWithFactory10from lp.testing import TestCaseWithFactory
10from lp.testing.faketransaction import FakeTransaction11from lp.testing.faketransaction import FakeTransaction
11from lp.testing.layers import ZopelessDatabaseLayer12from lp.testing.layers import ZopelessDatabaseLayer
12from lp.services.log.logger import DevNullLogger
13from lp.translations.model.distroseries_translations_copy import (13from lp.translations.model.distroseries_translations_copy import (
14 copy_active_translations,14 copy_active_translations,
15 )15 )
1616
=== modified file 'lib/lp/translations/tests/test_pofilestatsjob.py'
--- lib/lp/translations/tests/test_pofilestatsjob.py 2012-04-24 20:57:27 +0000
+++ lib/lp/translations/tests/test_pofilestatsjob.py 2012-06-14 05:34:29 +0000
@@ -15,9 +15,7 @@
15 IJobSource,15 IJobSource,
16 IRunnableJob,16 IRunnableJob,
17 )17 )
18from lp.services.job.tests import (18from lp.services.job.tests import block_on_job
19 block_on_job
20 )
21from lp.services.webapp.testing import verifyObject19from lp.services.webapp.testing import verifyObject
22from lp.testing import TestCaseWithFactory20from lp.testing import TestCaseWithFactory
23from lp.testing.dbuser import dbuser21from lp.testing.dbuser import dbuser