Launchpad itself

Merge lp:~stevenk/launchpad/db-clean-up-lint-idsjob into lp:launchpad/db-devel

  1. db-clean-up-lint-idsjob
  2. Merge into db-devel
Proposed by Steve Kowalik
Status: Merged
Approved by: Robert Collins
Approved revision: no longer in the source branch.
Merged at revision: 9795
Proposed branch: lp:~stevenk/launchpad/db-clean-up-lint-idsjob
Merge into: lp:launchpad/db-devel
Diff against target: 144 lines (+16/-21)
4 files modified
lib/lp/soyuz/interfaces/distributionjob.py (+7/-8)
lib/lp/soyuz/model/distributionjob.py (+5/-6)
lib/lp/soyuz/model/initialisedistroseriesjob.py (+0/-3)
lib/lp/soyuz/tests/test_initialisedistroseriesjob.py (+4/-4)
To merge this branch: bzr merge lp:~stevenk/launchpad/db-clean-up-lint-idsjob
Reviewer Review Type Date Requested Status
Robert Collins (community) Approve
Review via email: mp+35621@code.launchpad.net

Commit message

Lint clean up for DistributionJob/InitialiseDistroSeriesJob.

Description of the change

This branch just cleans up lint for the InitialiseDistroSeriesJob/DistributionJob code I landed earlier.

To post a comment you must log in.
Revision history for this message
Robert Collins (lifeless) wrote :

doit

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/soyuz/interfaces/distributionjob.py'
2--- lib/lp/soyuz/interfaces/distributionjob.py 2010-09-01 07:58:43 +0000
3+++ lib/lp/soyuz/interfaces/distributionjob.py 2010-09-16 01:43:12 +0000
4@@ -13,7 +13,7 @@
5 from lazr.enum import DBEnumeratedType, DBItem
6 from zope.interface import Attribute, Interface
7 from zope.schema import Int, Object
8-
9+
10 from canonical.launchpad import _
11
12 from lp.services.job.interfaces.job import IJob, IJobSource, IRunnableJob
13@@ -23,10 +23,10 @@
14
15 class IDistributionJob(Interface):
16 """A Job that initialises acts on a distribution."""
17-
18+
19 id = Int(
20- title=_('DB ID'), required=True, readonly=True,
21- description=_("The tracking number for this job."))
22+ title=_('DB ID'), required=True, readonly=True,
23+ description=_("The tracking number for this job."))
24
25 distribution = Object(
26 title=_('The Distribution this job is about.'),
27@@ -37,9 +37,9 @@
28 schema=IDistroSeries, required=False)
29
30 job = Object(
31- title=_('The common Job attributes'), schema=IJob, required=True)
32-
33- metadata = Attribute('A dict of data about the job.')
34+ title=_('The common Job attributes'), schema=IJob, required=True)
35+
36+ metadata = Attribute('A dict of data about the job.')
37
38 def destroySelf():
39 """Destroy this object."""
40@@ -64,4 +64,3 @@
41
42 class IInitialiseDistroSeriesJob(IRunnableJob):
43 """A Job that performs actions on a distribution."""
44-
45
46=== modified file 'lib/lp/soyuz/model/distributionjob.py'
47--- lib/lp/soyuz/model/distributionjob.py 2010-09-03 07:05:50 +0000
48+++ lib/lp/soyuz/model/distributionjob.py 2010-09-16 01:43:12 +0000
49@@ -13,14 +13,14 @@
50 from storm.base import Storm
51 from storm.locals import And, Int, Reference, Unicode
52
53-from zope.component import getUtility
54-from zope.interface import classProvides, implements
55+from zope.interface import implements
56
57 from canonical.database.enumcol import EnumCol
58 from canonical.launchpad.interfaces.lpstorm import IStore
59
60 from lazr.delegates import delegates
61-
62+
63+from lp.app.errors import NotFoundError
64 from lp.registry.model.distribution import Distribution
65 from lp.registry.model.distroseries import DistroSeries
66 from lp.soyuz.interfaces.distributionjob import (
67@@ -80,12 +80,12 @@
68
69 :return: the DistributionJob with the specified id, as
70 the current DistributionJobDerived subclass.
71- :raises: SQLObjectNotFound if there is no job with the specified id,
72+ :raises: NotFoundError if there is no job with the specified id,
73 or its job_type does not match the desired subclass.
74 """
75 job = DistributionJob.get(job_id)
76 if job.job_type != cls.class_job_type:
77- raise SQLObjectNotFound(
78+ raise NotFoundError(
79 'No object found with id %d and type %s' % (job_id,
80 cls.class_job_type.title))
81 return cls(job)
82@@ -110,4 +110,3 @@
83 ('distribution_job_type', self.context.job_type.title),
84 ])
85 return vars
86-
87
88=== modified file 'lib/lp/soyuz/model/initialisedistroseriesjob.py'
89--- lib/lp/soyuz/model/initialisedistroseriesjob.py 2010-09-03 07:05:50 +0000
90+++ lib/lp/soyuz/model/initialisedistroseriesjob.py 2010-09-16 01:43:12 +0000
91@@ -7,12 +7,10 @@
92 "InitialiseDistroSeriesJob",
93 ]
94
95-from zope.component import getUtility
96 from zope.interface import classProvides, implements
97
98 from canonical.launchpad.interfaces.lpstorm import IMasterStore
99
100-from lp.services.job.model.job import Job
101 from lp.soyuz.interfaces.distributionjob import (
102 DistributionJobType,
103 IInitialiseDistroSeriesJob,
104@@ -48,4 +46,3 @@
105 ids = InitialiseDistroSeries(self.distroseries)
106 ids.check()
107 ids.initialise()
108-
109
110=== modified file 'lib/lp/soyuz/tests/test_initialisedistroseriesjob.py'
111--- lib/lp/soyuz/tests/test_initialisedistroseriesjob.py 2010-09-03 07:05:50 +0000
112+++ lib/lp/soyuz/tests/test_initialisedistroseriesjob.py 2010-09-16 01:43:12 +0000
113@@ -18,7 +18,7 @@
114
115 class InitialiseDistroSeriesJobTests(TestCaseWithFactory):
116 """Test case for InitialiseDistroSeriesJob."""
117-
118+
119 layer = LaunchpadZopelessLayer
120
121 def test_getOopsVars(self):
122@@ -35,12 +35,12 @@
123 def _getJobs(self):
124 """Return the pending InitialiseDistroSeriesJobs as a list."""
125 return list(InitialiseDistroSeriesJob.iterReady())
126-
127+
128 def _getJobCount(self):
129 """Return the number of InitialiseDistroSeriesJobs in the
130 queue."""
131 return len(self._getJobs())
132-
133+
134 def test_create_only_creates_one(self):
135 distroseries = self.factory.makeDistroSeries()
136 # If there's already a InitialiseDistroSeriesJob for a
137@@ -49,7 +49,7 @@
138 job = getUtility(IInitialiseDistroSeriesJobSource).create(
139 distroseries)
140 transaction.commit()
141-
142+
143 # There will now be one job in the queue.
144 self.assertEqual(1, self._getJobCount())
145

Subscribers

People subscribed via source and target branches

to status/vote changes: