Launchpad itself

Merge lp://qastaging/~jml/launchpad/pocket-to-registry into lp://qastaging/launchpad

  1. pocket-to-registry
  2. Merge into devel
Proposed by Jonathan Lange
Status: Merged
Approved by: Henning Eggers
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp://qastaging/~jml/launchpad/pocket-to-registry
Merge into: lp://qastaging/launchpad
Diff against target: None lines
To merge this branch: bzr merge lp://qastaging/~jml/launchpad/pocket-to-registry
Reviewer Review Type Date Requested Status
Henning Eggers (community) Approve
Review via email: mp+10896@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Jonathan Lange (jml) wrote :

This branch moves the PackagePublishingPocket class out of lp.soyuz and into lp.registry, as discussed previously with cprov & bigjools.

The changes are almost entirely mechanical.

Revision history for this message
Jonathan Lange (jml) wrote :

Note also that the tests pass.

Revision history for this message
Henning Eggers (henninge) wrote :

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi Jono,
thank you for tackling this!

Am 31.08.2009 02:10, Jonathan Lange schrieb:
> This branch moves the PackagePublishingPocket class out of lp.soyuz and into lp.registry, as discussed previously with cprov & bigjools.
>
> The changes are almost entirely mechanical.

Yup, and very well executed they are. Seeing that the test suite passes,
I trust you didn't miss anything ;-)

I see that you also added lots of new lines and commas to make the code
prettier and easier to extend. Very good job! Thank you.

I just have two remarks on comments, otherwise this branch is good to land.

 review approve
 merge approved

Cheers,
Henning

> === modified file 'lib/lp/archivepublisher/publishing.py'
> --- lib/lp/archivepublisher/publishing.py 2009-06-24 23:28:16 +0000
> +++ lib/lp/archivepublisher/publishing.py 2009-08-16 12:38:12 +0000
> @@ -1,6 +1,7 @@
> # Copyright 2009 Canonical Ltd. This software is licensed under the
> # GNU Affero General Public License version 3 (see the file LICENSE).
>
> +# XXX: Why is this exporting pocketsuffix? - jml

Hm, we do have an XXX policy and I it recommends a different format. Can
you please use that?
https://launchpad.canonical.com/PolicyandProcess/XXXPolicy

> __all__ = ['Publisher', 'pocketsuffix', 'suffixpocket', 'getPublisher']
>
[...]

> === added file 'lib/lp/registry/interfaces/pocket.py'
> --- lib/lp/registry/interfaces/pocket.py 1970-01-01 00:00:00 +0000
> +++ lib/lp/registry/interfaces/pocket.py 2009-08-16 12:37:46 +0000
> @@ -0,0 +1,72 @@
> +# Copyright 2009 Canonical Ltd. This software is licensed under the
> +# GNU Affero General Public License version 3 (see the file LICENSE).
> +
> +"""Module docstring goes here."""

It really should, shouldn't it? ;-)

[...]

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkqbkiQACgkQBT3oW1L17ijrwACfQUuCMxNguI/zhtK9g0WgZNx7
nX0AoMTQNb8rNH7a3DA3+zboLGgRcGN3
=wEon
-----END PGP SIGNATURE-----

review: Approve
Revision history for this message
Jonathan Lange (jml) wrote :

On Mon, Aug 31, 2009 at 7:06 PM, Henning
Eggers<email address hidden> wrote:
> Review: Approve
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Hi Jono,
> thank you for tackling this!
>

My pleasure.

> Am 31.08.2009 02:10, Jonathan Lange schrieb:
>> This branch moves the PackagePublishingPocket class out of lp.soyuz and into lp.registry, as discussed previously with cprov & bigjools.
>>
>> The changes are almost entirely mechanical.
>
> Yup, and very well executed they are. Seeing that the test suite passes,
> I trust you didn't miss anything ;-)
>
> I see that you also added lots of new lines and commas to make the code
> prettier and easier to extend. Very good job! Thank you.
>
> I just have two remarks on comments, otherwise this branch is good to land.
>
>  review approve
>  merge approved
>
> Cheers,
> Henning
>
>
>
>> === modified file 'lib/lp/archivepublisher/publishing.py'
>> --- lib/lp/archivepublisher/publishing.py     2009-06-24 23:28:16 +0000
>> +++ lib/lp/archivepublisher/publishing.py     2009-08-16 12:38:12 +0000
>> @@ -1,6 +1,7 @@
>>  # Copyright 2009 Canonical Ltd.  This software is licensed under the
>>  # GNU Affero General Public License version 3 (see the file LICENSE).
>>
>> +# XXX: Why is this exporting pocketsuffix? - jml
>
> Hm, we do have an XXX policy and I it recommends a different format. Can
> you please use that?
> https://launchpad.canonical.com/PolicyandProcess/XXXPolicy
>

I've actually addressed the comment (it doesn't need to be exported)
rather than fix the comment formatting itself.

>
>>  __all__ = ['Publisher', 'pocketsuffix', 'suffixpocket', 'getPublisher']
>>
> [...]
>
>
>> === added file 'lib/lp/registry/interfaces/pocket.py'
>> --- lib/lp/registry/interfaces/pocket.py      1970-01-01 00:00:00 +0000
>> +++ lib/lp/registry/interfaces/pocket.py      2009-08-16 12:37:46 +0000
>> @@ -0,0 +1,72 @@
>> +# Copyright 2009 Canonical Ltd.  This software is licensed under the
>> +# GNU Affero General Public License version 3 (see the file LICENSE).
>> +
>> +"""Module docstring goes here."""
>
> It really should, shouldn't it? ;-)
>

I've written one.

Thanks for the review,
jml

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/canonical/launchpad/doc/distribution-soyuz.txt'
2--- lib/canonical/launchpad/doc/distribution-soyuz.txt 2009-08-14 12:59:56 +0000
3+++ lib/canonical/launchpad/doc/distribution-soyuz.txt 2009-08-30 23:57:41 +0000
4@@ -13,9 +13,10 @@
5 distribution:
6
7 >>> from lp.registry.interfaces.distribution import IDistributionSet
8+ >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
9 >>> from canonical.launchpad.interfaces import (
10 ... ISourcePackageName, IBinaryPackageName,
11- ... PackagePublishingPocket, PackagePublishingStatus)
12+ ... PackagePublishingStatus)
13
14 >>> distroset = getUtility(IDistributionSet)
15 >>> gentoo = distroset.getByName("gentoo")
16
17=== modified file 'lib/canonical/launchpad/interfaces/_schema_circular_imports.py'
18--- lib/canonical/launchpad/interfaces/_schema_circular_imports.py 2009-08-24 12:06:17 +0000
19+++ lib/canonical/launchpad/interfaces/_schema_circular_imports.py 2009-08-28 07:34:44 +0000
20@@ -46,6 +46,7 @@
21 from lp.registry.interfaces.distroseries import IDistroSeries
22 from lp.registry.interfaces.person import IPerson, IPersonPublic
23 from canonical.launchpad.interfaces.hwdb import HWBus, IHWSubmission
24+from lp.registry.interfaces.pocket import PackagePublishingPocket
25 from lp.registry.interfaces.product import IProduct
26 from lp.registry.interfaces.productseries import IProductSeries
27 from lp.soyuz.interfaces.archive import IArchive
28@@ -59,7 +60,7 @@
29 from lp.soyuz.interfaces.publishing import (
30 IBinaryPackagePublishingHistory, ISecureBinaryPackagePublishingHistory,
31 ISecureSourcePackagePublishingHistory, ISourcePackagePublishingHistory,
32- PackagePublishingPocket, PackagePublishingStatus)
33+ PackagePublishingStatus)
34 from lp.soyuz.interfaces.packageset import IPackageset
35 from lp.soyuz.interfaces.queue import (
36 IPackageUpload, PackageUploadCustomFormat, PackageUploadStatus)
37
38=== modified file 'lib/lp/archivepublisher/ftparchive.py'
39--- lib/lp/archivepublisher/ftparchive.py 2009-08-11 12:16:07 +0000
40+++ lib/lp/archivepublisher/ftparchive.py 2009-08-16 12:38:12 +0000
41@@ -15,14 +15,14 @@
42 from canonical.launchpad.webapp.interfaces import (
43 DEFAULT_FLAVOR, IStoreSelector, MAIN_STORE)
44 from lp.archivepublisher.utils import process_in_batches
45+from lp.registry.interfaces.pocket import (
46+ PackagePublishingPocket, pocketsuffix)
47 from lp.registry.model.sourcepackagename import SourcePackageName
48-from lp.soyuz.interfaces.publishing import (
49- PackagePublishingPocket, PackagePublishingStatus, pocketsuffix)
50+from lp.soyuz.interfaces.publishing import PackagePublishingStatus
51 from lp.soyuz.model.component import Component
52 from lp.soyuz.model.section import Section
53
54
55-
56 def package_name(filename):
57 """Extract a package name from a debian package filename."""
58 return (os.path.basename(filename).split("_"))[0]
59
60=== modified file 'lib/lp/archivepublisher/publishing.py'
61--- lib/lp/archivepublisher/publishing.py 2009-06-24 23:28:16 +0000
62+++ lib/lp/archivepublisher/publishing.py 2009-08-16 12:38:12 +0000
63@@ -1,6 +1,7 @@
64 # Copyright 2009 Canonical Ltd. This software is licensed under the
65 # GNU Affero General Public License version 3 (see the file LICENSE).
66
67+# XXX: Why is this exporting pocketsuffix? - jml
68 __all__ = ['Publisher', 'pocketsuffix', 'suffixpocket', 'getPublisher']
69
70 __metaclass__ = type
71@@ -24,12 +25,13 @@
72 from lp.archivepublisher.utils import (
73 RepositoryIndexFile, get_ppa_reference)
74 from canonical.database.sqlbase import sqlvalues
75+from lp.registry.interfaces.pocket import (
76+ PackagePublishingPocket, pocketsuffix)
77 from lp.soyuz.interfaces.archive import ArchivePurpose
78 from lp.soyuz.interfaces.binarypackagerelease import (
79 BinaryPackageFormat)
80 from lp.soyuz.interfaces.component import IComponentSet
81-from lp.soyuz.interfaces.publishing import (
82- pocketsuffix, PackagePublishingPocket, PackagePublishingStatus)
83+from lp.soyuz.interfaces.publishing import PackagePublishingStatus
84
85 from canonical.librarian.client import LibrarianClient
86
87
88=== modified file 'lib/lp/archivepublisher/tests/deathrow.txt'
89--- lib/lp/archivepublisher/tests/deathrow.txt 2009-06-12 16:36:02 +0000
90+++ lib/lp/archivepublisher/tests/deathrow.txt 2009-08-28 07:34:44 +0000
91@@ -35,8 +35,9 @@
92
93 >>> from lp.soyuz.tests.test_publishing import (
94 ... SoyuzTestPublisher)
95+ >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
96 >>> from lp.soyuz.interfaces.publishing import (
97- ... PackagePublishingPocket, PackagePublishingStatus)
98+ ... PackagePublishingStatus)
99
100 >>> hoary = ubuntu.getSeries('hoary')
101
102
103=== modified file 'lib/lp/archivepublisher/tests/test_dominator.py'
104--- lib/lp/archivepublisher/tests/test_dominator.py 2009-06-24 23:28:16 +0000
105+++ lib/lp/archivepublisher/tests/test_dominator.py 2009-08-28 07:34:44 +0000
106@@ -17,8 +17,8 @@
107 from lp.registry.interfaces.distroseries import DistroSeriesStatus
108 from lp.soyuz.interfaces.component import IComponentSet
109 from lp.registry.interfaces.person import IPersonSet
110-from lp.soyuz.interfaces.publishing import (
111- PackagePublishingStatus, PackagePublishingPocket)
112+from lp.registry.interfaces.pocket import PackagePublishingPocket
113+from lp.soyuz.interfaces.publishing import PackagePublishingStatus
114 from lp.soyuz.tests.test_publishing import TestNativePublishingBase
115
116
117
118=== modified file 'lib/lp/archivepublisher/tests/test_ftparchive.py'
119--- lib/lp/archivepublisher/tests/test_ftparchive.py 2009-08-11 11:11:37 +0000
120+++ lib/lp/archivepublisher/tests/test_ftparchive.py 2009-08-28 06:39:38 +0000
121@@ -21,7 +21,7 @@
122 from lp.archivepublisher.ftparchive import FTPArchiveHandler, f_touch
123 from lp.archivepublisher.publishing import Publisher
124 from lp.registry.interfaces.distribution import IDistributionSet
125-from lp.soyuz.interfaces.publishing import PackagePublishingPocket
126+from lp.registry.interfaces.pocket import PackagePublishingPocket
127
128
129 def sanitize_feisty_apt_ftparchive_output(text):
130
131=== modified file 'lib/lp/archivepublisher/tests/test_publisher.py'
132--- lib/lp/archivepublisher/tests/test_publisher.py 2009-06-24 23:28:16 +0000
133+++ lib/lp/archivepublisher/tests/test_publisher.py 2009-08-28 07:34:44 +0000
134@@ -33,8 +33,8 @@
135 from lp.registry.interfaces.distroseries import DistroSeriesStatus
136 from canonical.launchpad.interfaces.gpghandler import IGPGHandler
137 from lp.registry.interfaces.person import IPersonSet
138-from lp.soyuz.interfaces.publishing import (
139- PackagePublishingPocket, PackagePublishingStatus)
140+from lp.registry.interfaces.pocket import PackagePublishingPocket
141+from lp.soyuz.interfaces.publishing import PackagePublishingStatus
142 from lp.archivepublisher.interfaces.archivesigningkey import (
143 IArchiveSigningKey)
144 from lp.testing import get_lsb_information
145
146=== modified file 'lib/lp/archivepublisher/tests/util.py'
147--- lib/lp/archivepublisher/tests/util.py 2009-06-24 23:28:16 +0000
148+++ lib/lp/archivepublisher/tests/util.py 2009-08-28 07:34:44 +0000
149@@ -8,8 +8,8 @@
150 # Utility functions/classes for testing the archive publisher.
151
152 from lp.archivepublisher.tests import datadir
153-from canonical.launchpad.interfaces import (
154- DistroSeriesStatus, PackagePublishingPocket, PackagePublishingStatus)
155+from canonical.launchpad.interfaces import DistroSeriesStatus
156+from lp.registry.interfaces.pocket import PackagePublishingPocket
157
158 __all__ = ['FakeLogger']
159
160
161=== modified file 'lib/lp/archiveuploader/nascentupload.py'
162--- lib/lp/archiveuploader/nascentupload.py 2009-07-17 00:26:05 +0000
163+++ lib/lp/archiveuploader/nascentupload.py 2009-08-28 06:39:38 +0000
164@@ -28,9 +28,9 @@
165 from lp.archiveuploader.nascentuploadfile import (
166 UploadError, UploadWarning, CustomUploadFile, SourceUploadFile,
167 BaseBinaryUploadFile)
168+from lp.registry.interfaces.pocket import PackagePublishingPocket
169 from lp.soyuz.interfaces.archive import ArchivePurpose, MAIN_ARCHIVE_PURPOSES
170 from lp.soyuz.interfaces.archivepermission import IArchivePermissionSet
171-from lp.soyuz.interfaces.publishing import PackagePublishingPocket
172 from canonical.launchpad.interfaces import (
173 IBinaryPackageNameSet, IDistributionSet, ILibraryFileAliasSet,
174 ISourcePackageNameSet, NotFoundError, QueueInconsistentStateError)
175
176=== modified file 'lib/lp/archiveuploader/tests/static-translations.txt'
177--- lib/lp/archiveuploader/tests/static-translations.txt 2009-06-26 12:40:26 +0000
178+++ lib/lp/archiveuploader/tests/static-translations.txt 2009-08-28 06:39:38 +0000
179@@ -24,7 +24,7 @@
180 >>> from zope.interface import implements
181 >>> from lp.archiveuploader.tests import mock_logger
182 >>> from lp.registry.interfaces.distribution import IDistributionSet
183- >>> from lp.soyuz.interfaces.publishing import PackagePublishingPocket
184+ >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
185 >>> from lp.soyuz.interfaces.queue import (
186 ... IPackageUpload, IPackageUploadCustom, PackageUploadCustomFormat)
187 >>> from lp.soyuz.model.queue import PackageUploadCustom
188
189=== modified file 'lib/lp/archiveuploader/tests/test_buildduploads.py'
190--- lib/lp/archiveuploader/tests/test_buildduploads.py 2009-06-24 23:33:29 +0000
191+++ lib/lp/archiveuploader/tests/test_buildduploads.py 2009-08-28 07:34:44 +0000
192@@ -10,11 +10,12 @@
193 from lp.archiveuploader.tests.test_securityuploads import (
194 TestStagedBinaryUploadBase)
195 from lp.archiveuploader.uploadprocessor import UploadProcessor
196+from lp.registry.interfaces.pocket import PackagePublishingPocket
197 from canonical.database.constants import UTC_NOW
198-from canonical.launchpad.interfaces import (
199- PackagePublishingPocket, PackagePublishingStatus)
200+from canonical.launchpad.interfaces import PackagePublishingStatus
201 from canonical.launchpad.ftests import import_public_test_keys
202
203+
204 class TestBuilddUploads(TestStagedBinaryUploadBase):
205 """Test how buildd uploads behave inside Soyuz.
206
207
208=== modified file 'lib/lp/archiveuploader/tests/test_ppauploadprocessor.py'
209--- lib/lp/archiveuploader/tests/test_ppauploadprocessor.py 2009-07-17 18:46:25 +0000
210+++ lib/lp/archiveuploader/tests/test_ppauploadprocessor.py 2009-08-28 07:34:44 +0000
211@@ -29,8 +29,8 @@
212 from lp.registry.interfaces.person import IPersonSet
213 from lp.soyuz.interfaces.archive import ArchivePurpose, IArchiveSet
214 from lp.soyuz.interfaces.queue import PackageUploadStatus
215-from lp.soyuz.interfaces.publishing import (
216- PackagePublishingStatus, PackagePublishingPocket)
217+from lp.registry.interfaces.pocket import PackagePublishingPocket
218+from lp.soyuz.interfaces.publishing import PackagePublishingStatus
219 from lp.soyuz.interfaces.queue import NonBuildableSourceUploadError
220 from canonical.launchpad.interfaces import (
221 ILaunchpadCelebrities, ILibraryFileAliasSet, NotFoundError)
222
223=== modified file 'lib/lp/archiveuploader/tests/test_securityuploads.py'
224--- lib/lp/archiveuploader/tests/test_securityuploads.py 2009-06-24 23:33:29 +0000
225+++ lib/lp/archiveuploader/tests/test_securityuploads.py 2009-08-28 07:34:44 +0000
226@@ -13,10 +13,11 @@
227 from lp.archiveuploader.tests.test_uploadprocessor import (
228 TestUploadProcessorBase)
229 from lp.archiveuploader.uploadprocessor import UploadProcessor
230+from lp.registry.interfaces.pocket import PackagePublishingPocket
231 from lp.soyuz.model.build import Build
232 from lp.soyuz.model.processor import ProcessorFamily
233 from canonical.launchpad.interfaces import (
234- IDistributionSet, PackagePublishingPocket, PackageUploadStatus)
235+ IDistributionSet, PackageUploadStatus)
236
237
238 class TestStagedBinaryUploadBase(TestUploadProcessorBase):
239
240=== modified file 'lib/lp/archiveuploader/tests/test_uploadprocessor.py'
241--- lib/lp/archiveuploader/tests/test_uploadprocessor.py 2009-07-17 00:26:05 +0000
242+++ lib/lp/archiveuploader/tests/test_uploadprocessor.py 2009-08-28 07:34:44 +0000
243@@ -39,10 +39,10 @@
244 from canonical.launchpad.ftests import import_public_test_keys
245 from lp.registry.interfaces.distribution import IDistributionSet
246 from lp.registry.interfaces.distroseries import DistroSeriesStatus
247+from lp.registry.interfaces.pocket import PackagePublishingPocket
248 from lp.soyuz.interfaces.archive import ArchivePurpose, IArchiveSet
249 from lp.soyuz.interfaces.queue import PackageUploadStatus
250-from lp.soyuz.interfaces.publishing import (
251- PackagePublishingPocket, PackagePublishingStatus)
252+from lp.soyuz.interfaces.publishing import PackagePublishingStatus
253 from lp.soyuz.interfaces.queue import QueueInconsistentStateError
254 from canonical.launchpad.interfaces import ILibraryFileAliasSet
255 from lp.soyuz.interfaces.packageset import IPackagesetSet
256
257=== modified file 'lib/lp/archiveuploader/uploadpolicy.py'
258--- lib/lp/archiveuploader/uploadpolicy.py 2009-07-17 18:46:25 +0000
259+++ lib/lp/archiveuploader/uploadpolicy.py 2009-08-28 06:39:38 +0000
260@@ -12,8 +12,9 @@
261 from canonical.launchpad.interfaces import ILaunchpadCelebrities
262 from lp.registry.interfaces.distribution import IDistributionSet
263 from lp.registry.interfaces.distroseries import DistroSeriesStatus
264+from lp.registry.interfaces.pocket import PackagePublishingPocket
265 from lp.soyuz.interfaces.archive import ArchivePurpose
266-from lp.soyuz.interfaces.publishing import PackagePublishingPocket
267+
268
269 # Number of seconds in an hour (used later)
270 HOURS = 3600
271
272=== modified file 'lib/lp/buildmaster/buildergroup.py'
273--- lib/lp/buildmaster/buildergroup.py 2009-06-25 00:46:29 +0000
274+++ lib/lp/buildmaster/buildergroup.py 2009-08-16 12:38:12 +0000
275@@ -24,11 +24,12 @@
276 from canonical.config import config
277 from canonical.librarian.interfaces import ILibrarianClient
278 from canonical.librarian.utils import copy_and_close
279+from lp.registry.interfaces.pocket import pocketsuffix
280 from lp.soyuz.interfaces.build import BuildStatus, IBuildSet
281 from lp.soyuz.interfaces.builder import (
282 BuildDaemonError, BuildJobMismatch, IBuilderSet)
283 from lp.soyuz.interfaces.buildqueue import IBuildQueueSet
284-from canonical.launchpad.interfaces import NotFoundError, pocketsuffix
285+from canonical.launchpad.interfaces import NotFoundError
286 from canonical.database.constants import UTC_NOW
287 from canonical.database.sqlbase import (
288 flush_database_updates, clear_current_connection_cache, cursor)
289
290=== modified file 'lib/lp/buildmaster/tests/queuebuilder.txt'
291--- lib/lp/buildmaster/tests/queuebuilder.txt 2009-07-23 17:49:31 +0000
292+++ lib/lp/buildmaster/tests/queuebuilder.txt 2009-08-28 07:34:44 +0000
293@@ -21,9 +21,9 @@
294 >>> from canonical.launchpad.database import (
295 ... Build, BuildQueue, DistroArchSeries, PocketChroot)
296 >>> from lp.registry.model.distroseries import DistroSeries
297-
298+ >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
299 >>> from canonical.launchpad.interfaces import (
300- ... PackagePublishingPocket, PackagePublishingStatus)
301+ ... PackagePublishingStatus)
302
303 The Master side of Buildd requires access to Launchpad Database, the
304 user designed for this kind of access is 'fiera', see
305
306=== modified file 'lib/lp/code/browser/tests/test_branchlisting.py'
307--- lib/lp/code/browser/tests/test_branchlisting.py 2009-07-28 23:02:42 +0000
308+++ lib/lp/code/browser/tests/test_branchlisting.py 2009-08-28 06:39:38 +0000
309@@ -23,7 +23,7 @@
310 from lp.code.model.branch import Branch
311 from lp.registry.model.person import Owner
312 from lp.registry.model.product import Product
313-from lp.soyuz.interfaces.publishing import PackagePublishingPocket
314+from lp.registry.interfaces.pocket import PackagePublishingPocket
315 from lp.testing import TestCase, TestCaseWithFactory, time_counter
316 from canonical.launchpad.webapp.servers import LaunchpadTestRequest
317 from canonical.testing.layers import DatabaseFunctionalLayer
318
319=== modified file 'lib/lp/code/interfaces/seriessourcepackagebranch.py'
320--- lib/lp/code/interfaces/seriessourcepackagebranch.py 2009-07-17 00:26:05 +0000
321+++ lib/lp/code/interfaces/seriessourcepackagebranch.py 2009-08-28 06:39:38 +0000
322@@ -17,7 +17,7 @@
323 from zope.schema import Choice, Datetime, Int
324
325 from canonical.launchpad import _
326-from lp.soyuz.interfaces.publishing import PackagePublishingPocket
327+from lp.registry.interfaces.pocket import PackagePublishingPocket
328
329
330 class ISeriesSourcePackageBranch(Interface):
331
332=== modified file 'lib/lp/code/model/branchtarget.py'
333--- lib/lp/code/model/branchtarget.py 2009-08-04 00:41:49 +0000
334+++ lib/lp/code/model/branchtarget.py 2009-08-28 06:39:38 +0000
335@@ -13,13 +13,12 @@
336
337 from zope.component import getUtility
338 from zope.interface import implements
339-from zope.security.proxy import (
340- removeSecurityProxy, isinstance as zope_isinstance)
341+from zope.security.proxy import isinstance as zope_isinstance
342
343 from lp.code.interfaces.branchcollection import IAllBranches
344 from lp.code.interfaces.branchtarget import (
345 check_default_stacked_on, IBranchTarget)
346-from lp.soyuz.interfaces.publishing import PackagePublishingPocket
347+from lp.registry.interfaces.pocket import PackagePublishingPocket
348 from canonical.launchpad.webapp.interfaces import ICanonicalUrlData
349
350
351
352=== modified file 'lib/lp/code/model/linkedbranch.py'
353--- lib/lp/code/model/linkedbranch.py 2009-07-19 23:17:34 +0000
354+++ lib/lp/code/model/linkedbranch.py 2009-08-28 06:39:38 +0000
355@@ -15,10 +15,10 @@
356 from lp.registry.interfaces.distributionsourcepackage import (
357 IDistributionSourcePackage)
358 from lp.registry.interfaces.distroseries import NoSuchDistroSeries
359+from lp.registry.interfaces.pocket import PackagePublishingPocket
360 from lp.registry.interfaces.product import IProduct
361 from lp.registry.interfaces.productseries import IProductSeries
362 from lp.registry.interfaces.suitesourcepackage import ISuiteSourcePackage
363-from lp.soyuz.interfaces.publishing import PackagePublishingPocket
364
365
366 class ProductSeriesLinkedBranch:
367
368=== modified file 'lib/lp/code/model/seriessourcepackagebranch.py'
369--- lib/lp/code/model/seriessourcepackagebranch.py 2009-08-04 02:54:15 +0000
370+++ lib/lp/code/model/seriessourcepackagebranch.py 2009-08-28 06:39:38 +0000
371@@ -26,7 +26,7 @@
372 from lp.code.interfaces.seriessourcepackagebranch import (
373 IFindOfficialBranchLinks, IMakeOfficialBranchLinks,
374 ISeriesSourcePackageBranch)
375-from lp.soyuz.interfaces.publishing import PackagePublishingPocket
376+from lp.registry.interfaces.pocket import PackagePublishingPocket
377
378
379 class SeriesSourcePackageBranch(Storm):
380
381=== modified file 'lib/lp/code/model/tests/test_branch.py'
382--- lib/lp/code/model/tests/test_branch.py 2009-08-06 03:33:44 +0000
383+++ lib/lp/code/model/tests/test_branch.py 2009-08-28 06:39:38 +0000
384@@ -60,7 +60,7 @@
385 from lp.registry.interfaces.person import IPersonSet
386 from lp.registry.model.product import ProductSet
387 from lp.registry.model.sourcepackage import SourcePackage
388-from lp.soyuz.interfaces.publishing import PackagePublishingPocket
389+from lp.registry.interfaces.pocket import PackagePublishingPocket
390 from lp.testing import (
391 run_with_login, TestCase, TestCaseWithFactory, time_counter)
392 from lp.testing.factory import LaunchpadObjectFactory
393
394=== modified file 'lib/lp/code/model/tests/test_branchlookup.py'
395--- lib/lp/code/model/tests/test_branchlookup.py 2009-07-19 23:17:34 +0000
396+++ lib/lp/code/model/tests/test_branchlookup.py 2009-08-28 06:39:38 +0000
397@@ -26,7 +26,7 @@
398 from lp.registry.interfaces.product import (
399 InvalidProductName, NoSuchProduct)
400 from lp.registry.interfaces.productseries import NoSuchProductSeries
401-from lp.soyuz.interfaces.publishing import PackagePublishingPocket
402+from lp.registry.interfaces.pocket import PackagePublishingPocket
403 from lp.registry.interfaces.sourcepackagename import (
404 NoSuchSourcePackageName)
405 from lp.testing import run_with_login, TestCaseWithFactory
406
407=== modified file 'lib/lp/code/model/tests/test_branchtarget.py'
408--- lib/lp/code/model/tests/test_branchtarget.py 2009-08-04 00:41:49 +0000
409+++ lib/lp/code/model/tests/test_branchtarget.py 2009-08-28 06:39:38 +0000
410@@ -16,7 +16,7 @@
411 from lp.code.enums import BranchType
412 from lp.code.interfaces.branchtarget import IBranchTarget
413 from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
414-from lp.soyuz.interfaces.publishing import PackagePublishingPocket
415+from lp.registry.interfaces.pocket import PackagePublishingPocket
416 from canonical.launchpad.webapp import canonical_url
417 from canonical.launchpad.webapp.interfaces import IPrimaryContext
418 from canonical.testing import DatabaseFunctionalLayer
419
420=== modified file 'lib/lp/code/model/tests/test_linkedbranch.py'
421--- lib/lp/code/model/tests/test_linkedbranch.py 2009-07-19 23:17:34 +0000
422+++ lib/lp/code/model/tests/test_linkedbranch.py 2009-08-28 06:39:38 +0000
423@@ -16,7 +16,7 @@
424 from lp.code.interfaces.linkedbranch import (
425 CannotHaveLinkedBranch, get_linked_branch, ICanHasLinkedBranch)
426 from lp.registry.interfaces.distroseries import NoSuchDistroSeries
427-from lp.soyuz.interfaces.publishing import PackagePublishingPocket
428+from lp.registry.interfaces.pocket import PackagePublishingPocket
429 from lp.testing import run_with_login, TestCaseWithFactory
430
431
432
433=== modified file 'lib/lp/code/model/tests/test_seriessourcepackagebranch.py'
434--- lib/lp/code/model/tests/test_seriessourcepackagebranch.py 2009-08-04 02:54:41 +0000
435+++ lib/lp/code/model/tests/test_seriessourcepackagebranch.py 2009-08-28 06:39:38 +0000
436@@ -10,7 +10,7 @@
437 from canonical.testing.layers import DatabaseFunctionalLayer
438 from lp.code.model.seriessourcepackagebranch import (
439 SeriesSourcePackageBranchSet)
440-from lp.soyuz.interfaces.publishing import PackagePublishingPocket
441+from lp.registry.interfaces.pocket import PackagePublishingPocket
442 from lp.testing import TestCaseWithFactory
443
444
445
446=== modified file 'lib/lp/code/stories/branches/xx-branch-deletion.txt'
447--- lib/lp/code/stories/branches/xx-branch-deletion.txt 2009-08-12 00:58:24 +0000
448+++ lib/lp/code/stories/branches/xx-branch-deletion.txt 2009-08-28 06:39:38 +0000
449@@ -78,7 +78,7 @@
450 >>> from zope.security.proxy import removeSecurityProxy
451 >>> from canonical.launchpad.interfaces.launchpad import (
452 ... ILaunchpadCelebrities)
453- >>> from lp.soyuz.interfaces.publishing import PackagePublishingPocket
454+ >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
455 >>> from lp.registry.interfaces.person import IPersonSet
456 >>> login(ANONYMOUS)
457 >>> name12 = getUtility(IPersonSet).getByName('name12')
458
459=== modified file 'lib/lp/code/tests/helpers.py'
460--- lib/lp/code/tests/helpers.py 2009-07-17 02:25:09 +0000
461+++ lib/lp/code/tests/helpers.py 2009-08-28 06:39:38 +0000
462@@ -17,7 +17,7 @@
463 from lp.code.interfaces.seriessourcepackagebranch import (
464 IMakeOfficialBranchLinks)
465 from lp.registry.interfaces.distroseries import DistroSeriesStatus
466-from lp.soyuz.interfaces.publishing import PackagePublishingPocket
467+from lp.registry.interfaces.pocket import PackagePublishingPocket
468 from lp.testing import time_counter
469
470
471
472=== modified file 'lib/lp/code/tests/test_seriessourcepackagebranch.py'
473--- lib/lp/code/tests/test_seriessourcepackagebranch.py 2009-06-25 04:06:00 +0000
474+++ lib/lp/code/tests/test_seriessourcepackagebranch.py 2009-08-28 06:39:38 +0000
475@@ -21,7 +21,7 @@
476 from lp.code.interfaces.seriessourcepackagebranch import (
477 IFindOfficialBranchLinks, IMakeOfficialBranchLinks,
478 ISeriesSourcePackageBranch)
479-from lp.soyuz.interfaces.publishing import PackagePublishingPocket
480+from lp.registry.interfaces.pocket import PackagePublishingPocket
481 from lp.testing import TestCaseWithFactory
482 from canonical.testing import DatabaseFunctionalLayer
483
484
485=== modified file 'lib/lp/codehosting/inmemory.py'
486--- lib/lp/codehosting/inmemory.py 2009-08-04 05:14:32 +0000
487+++ lib/lp/codehosting/inmemory.py 2009-08-28 06:39:38 +0000
488@@ -27,7 +27,7 @@
489 from lp.code.interfaces.codehosting import (
490 BRANCH_TRANSPORT, CONTROL_TRANSPORT, LAUNCHPAD_ANONYMOUS,
491 LAUNCHPAD_SERVICES)
492-from lp.soyuz.interfaces.publishing import PackagePublishingPocket
493+from lp.registry.interfaces.pocket import PackagePublishingPocket
494 from lp.testing.factory import ObjectFactory
495 from canonical.launchpad.validators import LaunchpadValidationError
496 from lp.code.xmlrpc.codehosting import (
497
498=== modified file 'lib/lp/codehosting/scanner/tests/test_buglinks.py'
499--- lib/lp/codehosting/scanner/tests/test_buglinks.py 2009-07-19 04:41:14 +0000
500+++ lib/lp/codehosting/scanner/tests/test_buglinks.py 2009-08-28 06:39:38 +0000
501@@ -20,7 +20,7 @@
502 from lp.codehosting.scanner.buglinks import got_new_revision, BugBranchLinker
503 from lp.codehosting.scanner.fixture import make_zope_event_fixture
504 from lp.codehosting.scanner.tests.test_bzrsync import BzrSyncTestCase
505-from lp.soyuz.interfaces.publishing import PackagePublishingPocket
506+from lp.registry.interfaces.pocket import PackagePublishingPocket
507 from lp.testing import TestCase
508
509
510
511=== modified file 'lib/lp/registry/browser/distributionsourcepackage.py'
512--- lib/lp/registry/browser/distributionsourcepackage.py 2009-08-27 10:13:51 +0000
513+++ lib/lp/registry/browser/distributionsourcepackage.py 2009-08-30 23:49:54 +0000
514@@ -26,7 +26,7 @@
515 IDistributionSourcePackageRelease)
516 from lp.soyuz.interfaces.packagediff import IPackageDiffSet
517 from canonical.launchpad.interfaces.packaging import IPackagingUtil
518-from lp.soyuz.interfaces.publishing import pocketsuffix
519+from lp.registry.interfaces.pocket import pocketsuffix
520 from lp.registry.interfaces.product import IDistributionSourcePackage
521 from lp.bugs.browser.bugtask import BugTargetTraversalMixin
522 from lp.answers.browser.questiontarget import (
523
524=== modified file 'lib/lp/registry/browser/sourcepackage.py'
525--- lib/lp/registry/browser/sourcepackage.py 2009-08-24 20:28:33 +0000
526+++ lib/lp/registry/browser/sourcepackage.py 2009-08-28 06:39:38 +0000
527@@ -26,7 +26,7 @@
528 QuestionTargetFacetMixin, QuestionTargetAnswersMenu)
529 from lp.services.worlddata.interfaces.country import ICountry
530 from canonical.launchpad.interfaces.packaging import IPackaging
531-from lp.soyuz.interfaces.publishing import PackagePublishingPocket
532+from lp.registry.interfaces.pocket import PackagePublishingPocket
533 from lp.registry.interfaces.sourcepackage import ISourcePackage
534 from lp.translations.interfaces.potemplate import IPOTemplateSet
535 from canonical.launchpad import _
536
537=== modified file 'lib/lp/registry/doc/distribution-mirror.txt'
538--- lib/lp/registry/doc/distribution-mirror.txt 2009-08-13 19:03:36 +0000
539+++ lib/lp/registry/doc/distribution-mirror.txt 2009-08-28 07:34:44 +0000
540@@ -8,8 +8,8 @@
541 >>> from canonical.launchpad.interfaces import (
542 ... ICountrySet, IDistributionSet, IDistributionMirrorSet,
543 ... IDistroArchSeriesSet, IDistroSeriesSet, ILibraryFileAliasSet,
544- ... IPersonSet, MirrorContent, MirrorSpeed,
545- ... PackagePublishingPocket)
546+ ... IPersonSet, MirrorContent, MirrorSpeed)
547+ >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
548 >>> mirrorset = getUtility(IDistributionMirrorSet)
549 >>> distroset = getUtility(IDistributionSet)
550 >>> ubuntu = distroset.get(1)
551
552=== modified file 'lib/lp/registry/doc/distroseries.txt'
553--- lib/lp/registry/doc/distroseries.txt 2009-08-13 15:12:16 +0000
554+++ lib/lp/registry/doc/distroseries.txt 2009-08-30 23:57:41 +0000
555@@ -126,7 +126,7 @@
556 >>> breezy_autotest = ubuntu['breezy-autotest']
557 >>> hoary = ubuntu['hoary']
558
559- >>> from canonical.launchpad.interfaces import PackagePublishingPocket
560+ >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
561 >>> from canonical.launchpad.interfaces import DistroSeriesStatus
562
563 >>> warty.status.name
564@@ -557,7 +557,7 @@
565 >>> hoary = ubuntu['hoary']
566
567 >>> from canonical.launchpad.interfaces import (
568- ... PackagePublishingPocket, PackagePublishingStatus)
569+ ... PackagePublishingStatus)
570
571 >>> hoary_pub_sources = hoary.getSourcePackagePublishing(
572 ... PackagePublishingStatus.PUBLISHED,
573
574=== added file 'lib/lp/registry/interfaces/pocket.py'
575--- lib/lp/registry/interfaces/pocket.py 1970-01-01 00:00:00 +0000
576+++ lib/lp/registry/interfaces/pocket.py 2009-08-16 12:37:46 +0000
577@@ -0,0 +1,72 @@
578+# Copyright 2009 Canonical Ltd. This software is licensed under the
579+# GNU Affero General Public License version 3 (see the file LICENSE).
580+
581+"""Module docstring goes here."""
582+
583+__metaclass__ = type
584+__all__ = [
585+ 'PackagePublishingPocket',
586+ 'pocketsuffix',
587+ ]
588+
589+from lazr.enum import DBEnumeratedType, DBItem
590+
591+
592+class PackagePublishingPocket(DBEnumeratedType):
593+ """Package Publishing Pocket
594+
595+ A single distroseries can at its heart be more than one logical
596+ distroseries as the tools would see it. For example there may be a
597+ distroseries called 'hoary' and a SECURITY pocket subset of that would
598+ be referred to as 'hoary-security' by the publisher and the distro side
599+ tools.
600+ """
601+
602+ RELEASE = DBItem(0, """
603+ Release
604+
605+ The package versions that were published
606+ when the distribution release was made.
607+ For releases that are still under development,
608+ packages are published here only.
609+ """)
610+
611+ SECURITY = DBItem(10, """
612+ Security
613+
614+ Package versions containing security fixes for the released
615+ distribution.
616+ It is a good idea to have security updates turned on for your system.
617+ """)
618+
619+ UPDATES = DBItem(20, """
620+ Updates
621+
622+ Package versions including new features after the distribution
623+ release has been made.
624+ Updates are usually turned on by default after a fresh install.
625+ """)
626+
627+ PROPOSED = DBItem(30, """
628+ Proposed
629+
630+ Package versions including new functions that should be widely
631+ tested, but that are not yet part of a default installation.
632+ People who "live on the edge" will test these packages before they
633+ are accepted for use in "Updates".
634+ """)
635+
636+ BACKPORTS = DBItem(40, """
637+ Backports
638+
639+ Backported packages.
640+ """)
641+
642+
643+pocketsuffix = {
644+ PackagePublishingPocket.RELEASE: "",
645+ PackagePublishingPocket.SECURITY: "-security",
646+ PackagePublishingPocket.UPDATES: "-updates",
647+ PackagePublishingPocket.PROPOSED: "-proposed",
648+ PackagePublishingPocket.BACKPORTS: "-backports",
649+}
650
651=== modified file 'lib/lp/registry/interfaces/suitesourcepackage.py'
652--- lib/lp/registry/interfaces/suitesourcepackage.py 2009-06-30 16:56:07 +0000
653+++ lib/lp/registry/interfaces/suitesourcepackage.py 2009-08-28 06:39:38 +0000
654@@ -19,7 +19,7 @@
655 from lp.registry.interfaces.distribution import IDistribution
656 from lp.registry.interfaces.distroseries import IDistroSeries
657 from lp.registry.interfaces.sourcepackage import ISourcePackage
658-from lp.soyuz.interfaces.publishing import PackagePublishingPocket
659+from lp.registry.interfaces.pocket import PackagePublishingPocket
660
661
662 class ISuiteSourcePackage(Interface):
663
664=== modified file 'lib/lp/registry/model/distributionmirror.py'
665--- lib/lp/registry/model/distributionmirror.py 2009-06-25 04:06:00 +0000
666+++ lib/lp/registry/model/distributionmirror.py 2009-08-16 12:38:12 +0000
667@@ -29,6 +29,8 @@
668 from canonical.database.sqlbase import SQLBase, sqlvalues
669 from canonical.database.enumcol import EnumCol
670
671+from lp.registry.interfaces.pocket import (
672+ PackagePublishingPocket, pocketsuffix)
673 from lp.services.worlddata.model.country import Country
674 from lp.soyuz.model.files import (
675 BinaryPackageFile, SourcePackageReleaseFile)
676@@ -41,8 +43,7 @@
677 BinaryPackageFileType)
678 from lp.soyuz.interfaces.distroarchseries import IDistroArchSeries
679 from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
680-from lp.soyuz.interfaces.publishing import (
681- PackagePublishingPocket, PackagePublishingStatus, pocketsuffix)
682+from lp.soyuz.interfaces.publishing import PackagePublishingStatus
683 from lp.registry.interfaces.distributionmirror import (
684 IDistributionMirror, IDistributionMirrorSet, IMirrorCDImageDistroSeries,
685 IMirrorDistroArchSeries, IMirrorDistroSeriesSource, IMirrorProbeRecord,
686
687=== modified file 'lib/lp/registry/model/distroseries.py'
688--- lib/lp/registry/model/distroseries.py 2009-08-25 16:49:56 +0000
689+++ lib/lp/registry/model/distroseries.py 2009-08-28 06:24:36 +0000
690@@ -76,6 +76,8 @@
691 BinaryPackagePublishingHistory, SourcePackagePublishingHistory)
692 from lp.soyuz.model.queue import PackageUpload, PackageUploadQueue
693 from lp.soyuz.model.section import Section
694+from lp.registry.interfaces.pocket import (
695+ PackagePublishingPocket, pocketsuffix)
696 from lp.registry.model.sourcepackage import SourcePackage
697 from lp.registry.model.sourcepackagename import SourcePackageName
698 from lp.soyuz.model.sourcepackagerelease import (
699@@ -102,8 +104,7 @@
700 from lp.soyuz.interfaces.publishedpackage import (
701 IPublishedPackageSet)
702 from lp.soyuz.interfaces.publishing import (
703- active_publishing_status, ICanPublishPackages, PackagePublishingPocket,
704- PackagePublishingStatus, pocketsuffix)
705+ active_publishing_status, ICanPublishPackages, PackagePublishingStatus)
706 from lp.soyuz.interfaces.queue import IHasQueueItems, IPackageUploadSet
707 from lp.registry.interfaces.sourcepackage import (
708 ISourcePackage, ISourcePackageFactory)
709
710=== modified file 'lib/lp/registry/model/sourcepackage.py'
711--- lib/lp/registry/model/sourcepackage.py 2009-07-23 02:06:55 +0000
712+++ lib/lp/registry/model/sourcepackage.py 2009-08-28 07:34:44 +0000
713@@ -50,8 +50,8 @@
714 from lp.soyuz.interfaces.buildrecords import IHasBuildRecords
715 from canonical.launchpad.interfaces.packaging import PackagingType
716 from lp.translations.interfaces.potemplate import IHasTranslationTemplates
717-from lp.soyuz.interfaces.publishing import (
718- PackagePublishingPocket, PackagePublishingStatus)
719+from lp.registry.interfaces.pocket import PackagePublishingPocket
720+from lp.soyuz.interfaces.publishing import PackagePublishingStatus
721 from lp.answers.interfaces.questioncollection import (
722 QUESTION_STATUS_DEFAULT_SEARCH)
723 from lp.answers.interfaces.questiontarget import IQuestionTarget
724
725=== modified file 'lib/lp/registry/tests/test_distributionmirror.py'
726--- lib/lp/registry/tests/test_distributionmirror.py 2009-06-25 04:06:00 +0000
727+++ lib/lp/registry/tests/test_distributionmirror.py 2009-08-28 06:39:38 +0000
728@@ -18,7 +18,7 @@
729 IDistributionMirrorSet, MirrorContent, MirrorFreshness)
730 from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
731 from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
732-from lp.soyuz.interfaces.publishing import PackagePublishingPocket
733+from lp.registry.interfaces.pocket import PackagePublishingPocket
734 from lp.registry.interfaces.distribution import IDistributionSet
735 from lp.services.mail import stub
736
737
738=== modified file 'lib/lp/registry/tests/test_distributionmirror_prober.py'
739--- lib/lp/registry/tests/test_distributionmirror_prober.py 2009-07-23 13:44:13 +0000
740+++ lib/lp/registry/tests/test_distributionmirror_prober.py 2009-08-28 06:39:38 +0000
741@@ -23,7 +23,7 @@
742
743 import canonical
744 from canonical.config import config
745-from lp.soyuz.interfaces.publishing import PackagePublishingPocket
746+from lp.registry.interfaces.pocket import PackagePublishingPocket
747 from lazr.uri import URI
748 from canonical.launchpad.daemons.tachandler import TacTestSetup
749 from lp.registry.model.distributionmirror import DistributionMirror
750
751=== modified file 'lib/lp/registry/tests/test_distroseries.py'
752--- lib/lp/registry/tests/test_distroseries.py 2009-06-25 04:06:00 +0000
753+++ lib/lp/registry/tests/test_distroseries.py 2009-08-28 07:34:44 +0000
754@@ -15,11 +15,11 @@
755 from lp.soyuz.interfaces.archive import ArchivePurpose, IArchiveSet
756 from lp.registry.interfaces.distroseries import (
757 IDistroSeriesSet, NoSuchDistroSeries)
758+from lp.registry.interfaces.pocket import PackagePublishingPocket
759 from lp.soyuz.interfaces.distroseriessourcepackagerelease import (
760 IDistroSeriesSourcePackageRelease)
761 from lp.soyuz.interfaces.publishing import (
762- active_publishing_status, PackagePublishingPocket,
763- PackagePublishingStatus)
764+ active_publishing_status, PackagePublishingStatus)
765 from lp.testing import TestCase, TestCaseWithFactory
766 from lp.soyuz.tests.test_publishing import SoyuzTestPublisher
767 from canonical.testing import (
768
769=== modified file 'lib/lp/registry/tests/test_sourcepackage.py'
770--- lib/lp/registry/tests/test_sourcepackage.py 2009-07-19 23:17:34 +0000
771+++ lib/lp/registry/tests/test_sourcepackage.py 2009-08-28 06:39:38 +0000
772@@ -14,7 +14,7 @@
773 from canonical.launchpad.ftests import login_person, logout
774 from lp.registry.interfaces.distroseries import DistroSeriesStatus
775 from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
776-from lp.soyuz.interfaces.publishing import PackagePublishingPocket
777+from lp.registry.interfaces.pocket import PackagePublishingPocket
778 from lp.code.interfaces.seriessourcepackagebranch import (
779 IMakeOfficialBranchLinks)
780 from lp.testing import TestCaseWithFactory
781
782=== modified file 'lib/lp/registry/tests/test_suitesourcepackage.py'
783--- lib/lp/registry/tests/test_suitesourcepackage.py 2009-06-30 16:56:07 +0000
784+++ lib/lp/registry/tests/test_suitesourcepackage.py 2009-08-28 06:39:38 +0000
785@@ -10,7 +10,7 @@
786 from canonical.testing.layers import DatabaseFunctionalLayer
787
788 from lp.registry.model.suitesourcepackage import SuiteSourcePackage
789-from lp.soyuz.interfaces.publishing import PackagePublishingPocket
790+from lp.registry.interfaces.pocket import PackagePublishingPocket
791 from lp.testing import TestCaseWithFactory
792
793
794
795=== modified file 'lib/lp/soyuz/adapters/archivedependencies.py'
796--- lib/lp/soyuz/adapters/archivedependencies.py 2009-07-17 00:26:05 +0000
797+++ lib/lp/soyuz/adapters/archivedependencies.py 2009-08-16 12:38:12 +0000
798@@ -37,10 +37,10 @@
799 ]
800
801 from canonical.config import config
802-from lp.soyuz.interfaces.archive import (
803- ArchivePurpose, ALLOW_RELEASE_BUILDS)
804-from lp.soyuz.interfaces.publishing import (
805- PackagePublishingPocket, PackagePublishingStatus, pocketsuffix)
806+from lp.registry.interfaces.pocket import (
807+ PackagePublishingPocket, pocketsuffix)
808+from lp.soyuz.interfaces.archive import ArchivePurpose, ALLOW_RELEASE_BUILDS
809+from lp.soyuz.interfaces.publishing import PackagePublishingStatus
810 from lazr.uri import URI
811
812
813
814=== modified file 'lib/lp/soyuz/adapters/packagelocation.py'
815--- lib/lp/soyuz/adapters/packagelocation.py 2009-06-25 04:06:00 +0000
816+++ lib/lp/soyuz/adapters/packagelocation.py 2009-08-28 06:39:38 +0000
817@@ -87,7 +87,7 @@
818 # Avoid circular imports.
819 from lp.registry.interfaces.distribution import IDistributionSet
820 from lp.soyuz.interfaces.archive import ArchivePurpose, IArchiveSet
821- from lp.soyuz.interfaces.publishing import PackagePublishingPocket
822+ from lp.registry.interfaces.pocket import PackagePublishingPocket
823
824 try:
825 distribution = getUtility(IDistributionSet)[distribution_name]
826
827=== modified file 'lib/lp/soyuz/browser/archive.py'
828--- lib/lp/soyuz/browser/archive.py 2009-08-24 20:28:33 +0000
829+++ lib/lp/soyuz/browser/archive.py 2009-08-28 07:34:44 +0000
830@@ -65,9 +65,9 @@
831 IPackageCopyRequestSet)
832 from lp.soyuz.interfaces.packageset import IPackagesetSet
833 from lp.registry.interfaces.person import IPersonSet, PersonVisibility
834+from lp.registry.interfaces.pocket import PackagePublishingPocket
835 from lp.soyuz.interfaces.publishing import (
836- PackagePublishingPocket, active_publishing_status,
837- inactive_publishing_status, IPublishingSet)
838+ active_publishing_status, inactive_publishing_status, IPublishingSet)
839 from lp.registry.interfaces.sourcepackagename import (
840 ISourcePackageNameSet)
841 from canonical.launchpad.webapp import (
842
843=== modified file 'lib/lp/soyuz/browser/tests/build-views.txt'
844--- lib/lp/soyuz/browser/tests/build-views.txt 2009-08-18 17:52:41 +0000
845+++ lib/lp/soyuz/browser/tests/build-views.txt 2009-08-28 07:34:44 +0000
846@@ -177,7 +177,7 @@
847 First lets create a package upload for this build:
848 XXX: noodles 2009-01-16 bug 317863: move this into the STP.
849
850- >>> from lp.soyuz.interfaces.publishing import (
851+ >>> from lp.registry.interfaces.pocket import (
852 ... PackagePublishingPocket)
853 >>> from lp.soyuz.model.queue import PackageUploadBuild
854 >>> build = cprov_failed_build_view.context
855
856=== modified file 'lib/lp/soyuz/doc/archive-dependencies.txt'
857--- lib/lp/soyuz/doc/archive-dependencies.txt 2009-08-13 15:12:16 +0000
858+++ lib/lp/soyuz/doc/archive-dependencies.txt 2009-08-28 07:34:44 +0000
859@@ -130,7 +130,7 @@
860 avoids changes to accommodate the backported source in the already
861 released series.
862
863- >>> from lp.soyuz.interfaces.publishing import (
864+ >>> from lp.registry.interfaces.pocket import (
865 ... PackagePublishingPocket)
866 >>> from zope.security.proxy import removeSecurityProxy
867
868
869=== modified file 'lib/lp/soyuz/doc/archive-files.txt'
870--- lib/lp/soyuz/doc/archive-files.txt 2009-06-17 13:52:11 +0000
871+++ lib/lp/soyuz/doc/archive-files.txt 2009-08-28 07:34:44 +0000
872@@ -115,7 +115,7 @@
873
874 Adding and retrieving a source changesfile.
875
876- >>> from lp.soyuz.interfaces.publishing import (
877+ >>> from lp.registry.interfaces.pocket import (
878 ... PackagePublishingPocket)
879 >>> source_upload = test_source.distroseries.createQueueEntry(
880 ... pocket=PackagePublishingPocket.RELEASE,
881
882=== modified file 'lib/lp/soyuz/doc/archive.txt'
883--- lib/lp/soyuz/doc/archive.txt 2009-08-13 19:03:36 +0000
884+++ lib/lp/soyuz/doc/archive.txt 2009-08-28 06:41:25 +0000
885@@ -348,7 +348,7 @@
886
887 Using 'pocket' filter:
888
889- >>> from canonical.launchpad.interfaces import PackagePublishingPocket
890+ >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
891 >>> cprov_archive.getPublishedSources(
892 ... distroseries=warty,
893 ... pocket=PackagePublishingPocket.RELEASE).count()
894
895=== modified file 'lib/lp/soyuz/doc/build-estimated-dispatch-time.txt'
896--- lib/lp/soyuz/doc/build-estimated-dispatch-time.txt 2009-08-13 15:12:16 +0000
897+++ lib/lp/soyuz/doc/build-estimated-dispatch-time.txt 2009-08-28 07:34:44 +0000
898@@ -33,7 +33,7 @@
899 >>> hoary.main_archive.require_virtualized
900 False
901
902- >>> from canonical.launchpad.interfaces import (
903+ >>> from lp.registry.interfaces.pocket import (
904 ... PackagePublishingPocket)
905 >>> alsa_hoary = hoary.getSourcePackage('alsa-utils')
906 >>> alsa_spr = alsa_hoary['1.0.9a-4'].sourcepackagerelease
907
908=== modified file 'lib/lp/soyuz/doc/build.txt'
909--- lib/lp/soyuz/doc/build.txt 2009-07-03 14:12:35 +0000
910+++ lib/lp/soyuz/doc/build.txt 2009-08-28 06:41:25 +0000
911@@ -497,7 +497,7 @@
912
913 Checking optional 'pocket' restriction:
914
915- >>> from canonical.launchpad.interfaces import PackagePublishingPocket
916+ >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
917 >>> bs.getBuildsByArchIds(arch_ids,
918 ... pocket=PackagePublishingPocket.UPDATES).count()
919 0
920@@ -747,7 +747,7 @@
921
922 or using optional pocket argument:
923
924- >>> from canonical.launchpad.interfaces import PackagePublishingPocket
925+ >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
926
927 >>> ubuntu.getBuildRecords(
928 ... build_state=BuildStatus.NEEDSBUILD,
929
930=== modified file 'lib/lp/soyuz/doc/buildd-dispatching.txt'
931--- lib/lp/soyuz/doc/buildd-dispatching.txt 2009-05-14 09:28:47 +0000
932+++ lib/lp/soyuz/doc/buildd-dispatching.txt 2009-08-28 06:39:38 +0000
933@@ -32,7 +32,7 @@
934
935 >>> from canonical.launchpad.interfaces import ILibraryFileAliasSet
936 >>> from lp.registry.interfaces.distribution import IDistributionSet
937- >>> from lp.soyuz.interfaces.publishing import PackagePublishingPocket
938+ >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
939
940 >>> hoary = getUtility(IDistributionSet)['ubuntu']['hoary']
941 >>> hoary_i386 = hoary['i386']
942
943=== modified file 'lib/lp/soyuz/doc/buildd-queuebuilder-lookup.txt'
944--- lib/lp/soyuz/doc/buildd-queuebuilder-lookup.txt 2009-08-24 20:05:36 +0000
945+++ lib/lp/soyuz/doc/buildd-queuebuilder-lookup.txt 2009-08-28 07:34:44 +0000
946@@ -21,10 +21,11 @@
947 ... SecureSourcePackagePublishingHistory)
948 >>> from lp.registry.interfaces.distribution import IDistributionSet
949 >>> from lp.registry.interfaces.person import IPersonSet
950+ >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
951 >>> from lp.soyuz.interfaces.archive import (
952 ... ArchivePurpose, IArchiveSet)
953 >>> from lp.soyuz.interfaces.publishing import (
954- ... PackagePublishingPocket, PackagePublishingStatus)
955+ ... PackagePublishingStatus)
956
957 >>> ubuntu = getUtility(IDistributionSet)['ubuntu']
958 >>> cprov = getUtility(IPersonSet).getByName('cprov')
959
960=== modified file 'lib/lp/soyuz/doc/buildd-scoring.txt'
961--- lib/lp/soyuz/doc/buildd-scoring.txt 2009-07-01 13:16:44 +0000
962+++ lib/lp/soyuz/doc/buildd-scoring.txt 2009-08-30 23:57:41 +0000
963@@ -30,8 +30,8 @@
964
965 >>> from canonical.database.sqlbase import commit
966 >>> from canonical.launchpad.interfaces import (
967- ... PackagePublishingPocket, PackagePublishingStatus,
968- ... SourcePackageUrgency)
969+ ... PackagePublishingStatus, SourcePackageUrgency)
970+ >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
971 >>> from lp.soyuz.tests.test_publishing import (
972 ... SoyuzTestPublisher)
973 >>> from canonical.testing.layers import LaunchpadZopelessLayer
974
975=== modified file 'lib/lp/soyuz/doc/buildd-slavescanner.txt'
976--- lib/lp/soyuz/doc/buildd-slavescanner.txt 2009-08-27 02:00:29 +0000
977+++ lib/lp/soyuz/doc/buildd-slavescanner.txt 2009-08-30 23:49:54 +0000
978@@ -521,7 +521,7 @@
979 to it.
980
981 >>> from zope.security.proxy import removeSecurityProxy
982- >>> from canonical.launchpad.interfaces import PackagePublishingPocket
983+ >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
984 >>> removeSecurityProxy(
985 ... bqItem10.build).pocket = PackagePublishingPocket.UPDATES
986 >>> setupBuildQueue(bqItem10, a_builder)
987
988=== modified file 'lib/lp/soyuz/doc/buildqueue.txt'
989--- lib/lp/soyuz/doc/buildqueue.txt 2009-05-06 20:53:05 +0000
990+++ lib/lp/soyuz/doc/buildqueue.txt 2009-08-28 07:34:44 +0000
991@@ -235,7 +235,7 @@
992 Create a new Builds and corresponding BuildQueues in ubuntu/hoary/hppa
993 for testing if we will also be able to deal with more than one architecture.
994
995- >>> from canonical.launchpad.interfaces import (
996+ >>> from lp.registry.interfaces.pocket import (
997 ... PackagePublishingPocket)
998 >>> alsa_hoary = hoary.getSourcePackage('alsa-utils')
999 >>> alsa_spr = alsa_hoary['1.0.9a-4'].sourcepackagerelease
1000
1001=== modified file 'lib/lp/soyuz/doc/closing-bugs-from-changelogs.txt'
1002--- lib/lp/soyuz/doc/closing-bugs-from-changelogs.txt 2009-07-16 00:00:27 +0000
1003+++ lib/lp/soyuz/doc/closing-bugs-from-changelogs.txt 2009-08-28 06:41:25 +0000
1004@@ -49,7 +49,7 @@
1005 Launchpad-bugs-fixed header. This is required so that we have some data
1006 for close_bugs to operate on.
1007
1008- >>> from canonical.launchpad.interfaces import PackagePublishingPocket
1009+ >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
1010 >>> def add_package_upload(
1011 ... source_release, fixing_text,
1012 ... pocket=PackagePublishingPocket.RELEASE,
1013
1014=== modified file 'lib/lp/soyuz/doc/distroarchseries.txt'
1015--- lib/lp/soyuz/doc/distroarchseries.txt 2009-07-08 08:04:50 +0000
1016+++ lib/lp/soyuz/doc/distroarchseries.txt 2009-08-28 07:34:44 +0000
1017@@ -145,7 +145,8 @@
1018 ubuntu/breezy-autotest/i386, which is empty:
1019
1020 >>> from canonical.launchpad.interfaces import (
1021- ... IDistributionSet, IPersonSet, PackagePublishingPocket)
1022+ ... IDistributionSet, IPersonSet)
1023+ >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
1024 >>> from lp.soyuz.model.publishing import (
1025 ... SecureBinaryPackagePublishingHistory)
1026
1027
1028=== modified file 'lib/lp/soyuz/doc/distroarchseriesbinarypackage.txt'
1029--- lib/lp/soyuz/doc/distroarchseriesbinarypackage.txt 2009-04-30 12:16:12 +0000
1030+++ lib/lp/soyuz/doc/distroarchseriesbinarypackage.txt 2009-08-28 07:34:44 +0000
1031@@ -33,7 +33,8 @@
1032 >>> binpackageformat = BinaryPackageFormat.DEB
1033 >>> from canonical.launchpad.interfaces import (
1034 ... PackagePublishingPriority, PackagePublishingStatus,
1035- ... PackagePublishingPocket, IDistributionSet)
1036+ ... IDistributionSet)
1037+ >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
1038 >>> priority = PackagePublishingPriority.STANDARD
1039
1040 XXX: noodles 2008-11-05 bug=294585: The dependency on a database id
1041
1042=== modified file 'lib/lp/soyuz/doc/distroseries-publishing-lookups.txt'
1043--- lib/lp/soyuz/doc/distroseries-publishing-lookups.txt 2009-04-28 12:59:43 +0000
1044+++ lib/lp/soyuz/doc/distroseries-publishing-lookups.txt 2009-08-28 07:34:44 +0000
1045@@ -9,8 +9,8 @@
1046 ubuntu/breezy-autotest, which is empty:
1047
1048 >>> from canonical.launchpad.interfaces import (
1049- ... IDistributionSet, IPersonSet, PackagePublishingPocket,
1050- ... PackagePublishingStatus)
1051+ ... IDistributionSet, IPersonSet, PackagePublishingStatus)
1052+ >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
1053
1054 >>> ubuntu = getUtility(IDistributionSet)['ubuntu']
1055 >>> breezy_autotest = ubuntu['breezy-autotest']
1056
1057=== modified file 'lib/lp/soyuz/doc/distroseriesqueue-translations.txt'
1058--- lib/lp/soyuz/doc/distroseriesqueue-translations.txt 2009-08-13 15:12:16 +0000
1059+++ lib/lp/soyuz/doc/distroseriesqueue-translations.txt 2009-08-28 07:34:44 +0000
1060@@ -11,9 +11,10 @@
1061 ... SecureSourcePackagePublishingHistory)
1062 >>> from lp.registry.interfaces.distribution import IDistributionSet
1063 >>> from lp.registry.interfaces.distroseries import IDistroSeriesSet
1064+ >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
1065 >>> from lp.soyuz.interfaces.component import IComponentSet
1066 >>> from lp.soyuz.interfaces.publishing import (
1067- ... PackagePublishingPocket, PackagePublishingStatus)
1068+ ... PackagePublishingStatus)
1069 >>> from lp.registry.interfaces.sourcepackagename import (
1070 ... ISourcePackageNameSet)
1071
1072@@ -301,7 +302,7 @@
1073 >>> from lp.registry.interfaces.person import IPerson
1074 >>> from lp.soyuz.interfaces.sourcepackagerelease import (
1075 ... ISourcePackageRelease)
1076- >>> from lp.soyuz.interfaces.publishing import PackagePublishingPocket
1077+ >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
1078
1079 >>> class MockSourcePackageRelease:
1080 ... implements(ISourcePackageRelease)
1081
1082=== modified file 'lib/lp/soyuz/doc/distroseriesqueue.txt'
1083--- lib/lp/soyuz/doc/distroseriesqueue.txt 2009-07-16 15:06:35 +0000
1084+++ lib/lp/soyuz/doc/distroseriesqueue.txt 2009-08-28 06:41:25 +0000
1085@@ -414,7 +414,7 @@
1086
1087 Also check the optional argument pocket:
1088
1089- >>> from canonical.launchpad.interfaces import PackagePublishingPocket
1090+ >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
1091
1092 >>> breezy_autotest.getQueueItems(
1093 ... pocket=PackagePublishingPocket.RELEASE).count()
1094
1095=== modified file 'lib/lp/soyuz/doc/gina.txt'
1096--- lib/lp/soyuz/doc/gina.txt 2009-08-13 19:03:36 +0000
1097+++ lib/lp/soyuz/doc/gina.txt 2009-08-28 07:34:44 +0000
1098@@ -16,7 +16,7 @@
1099 ... Build)
1100 >>> from lp.registry.model.person import Person, WikiName
1101 >>> from lp.registry.model.teammembership import TeamParticipation
1102- >>> from canonical.launchpad.interfaces import (
1103+ >>> from lp.registry.interfaces.pocket import (
1104 ... PackagePublishingPocket)
1105 >>> SSPPH = SecureSourcePackagePublishingHistory
1106 >>> SBPPH = SecureBinaryPackagePublishingHistory
1107
1108=== modified file 'lib/lp/soyuz/doc/hasbuildrecords.txt'
1109--- lib/lp/soyuz/doc/hasbuildrecords.txt 2009-07-01 13:03:42 +0000
1110+++ lib/lp/soyuz/doc/hasbuildrecords.txt 2009-08-28 06:41:25 +0000
1111@@ -33,7 +33,7 @@
1112
1113 filtering by the pocket to which the build was published,
1114
1115- >>> from canonical.launchpad.interfaces import PackagePublishingPocket
1116+ >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
1117 >>> hoary.getBuildRecords(
1118 ... pocket=PackagePublishingPocket.RELEASE).count()
1119 5
1120
1121=== modified file 'lib/lp/soyuz/doc/initialise-from-parent.txt'
1122--- lib/lp/soyuz/doc/initialise-from-parent.txt 2009-04-28 12:59:43 +0000
1123+++ lib/lp/soyuz/doc/initialise-from-parent.txt 2009-08-28 06:41:25 +0000
1124@@ -158,7 +158,7 @@
1125 appropriately (we won't care about the source architecturehintlist in
1126 this test, see more details in buildd-queuebuilder)
1127
1128- >>> from canonical.launchpad.interfaces import PackagePublishingPocket
1129+ >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
1130 >>> created_build = pmount_source.sourcepackagerelease.createBuild(
1131 ... foobuntu['i386'], PackagePublishingPocket.RELEASE,
1132 ... ubuntu.main_archive)
1133
1134=== modified file 'lib/lp/soyuz/doc/nascentupload.txt'
1135--- lib/lp/soyuz/doc/nascentupload.txt 2009-08-13 15:12:16 +0000
1136+++ lib/lp/soyuz/doc/nascentupload.txt 2009-08-28 06:41:25 +0000
1137@@ -635,7 +635,7 @@
1138
1139 Build creation is done based on the SourcePackageRelease object, step 5:
1140
1141- >>> from canonical.launchpad.interfaces import PackagePublishingPocket
1142+ >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
1143 >>> multibar_build = multibar_spr.createBuild(
1144 ... hoary['i386'], PackagePublishingPocket.RELEASE,
1145 ... multibar_src_queue.archive)
1146
1147=== modified file 'lib/lp/soyuz/doc/pocketchroot.txt'
1148--- lib/lp/soyuz/doc/pocketchroot.txt 2009-04-28 12:59:43 +0000
1149+++ lib/lp/soyuz/doc/pocketchroot.txt 2009-08-28 06:41:25 +0000
1150@@ -7,7 +7,7 @@
1151
1152 >>> from canonical.launchpad.interfaces import IDistributionSet
1153 >>> from canonical.launchpad.interfaces import ILibraryFileAliasSet
1154- >>> from canonical.launchpad.interfaces import PackagePublishingPocket
1155+ >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
1156
1157
1158 Grab a distroarchseries:
1159
1160=== modified file 'lib/lp/soyuz/doc/publishing.txt'
1161--- lib/lp/soyuz/doc/publishing.txt 2009-08-13 19:03:36 +0000
1162+++ lib/lp/soyuz/doc/publishing.txt 2009-08-28 06:41:25 +0000
1163@@ -384,7 +384,7 @@
1164 test this feature. We will create a publication for a source (foo) and
1165 two architecture-specific binaries in ubuntu/breezy-autotest.
1166
1167- >>> from canonical.launchpad.interfaces import PackagePublishingPocket
1168+ >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
1169 >>> source = test_publisher.getPubSource(
1170 ... architecturehintlist='any',
1171 ... status=PackagePublishingStatus.PUBLISHED,
1172
1173=== modified file 'lib/lp/soyuz/doc/sourcepackagerelease-build-lookup.txt'
1174--- lib/lp/soyuz/doc/sourcepackagerelease-build-lookup.txt 2009-08-13 15:12:16 +0000
1175+++ lib/lp/soyuz/doc/sourcepackagerelease-build-lookup.txt 2009-08-28 07:34:44 +0000
1176@@ -30,7 +30,7 @@
1177 >>> from canonical.launchpad.interfaces import IPersonSet
1178 >>> cprov = getUtility(IPersonSet).getByName('cprov')
1179
1180- >>> from canonical.launchpad.interfaces import (
1181+ >>> from lp.registry.interfaces.pocket import (
1182 ... PackagePublishingPocket)
1183 >>> pocket_release = PackagePublishingPocket.RELEASE
1184
1185
1186=== modified file 'lib/lp/soyuz/doc/sourcepackagerelease.txt'
1187--- lib/lp/soyuz/doc/sourcepackagerelease.txt 2009-07-23 17:49:31 +0000
1188+++ lib/lp/soyuz/doc/sourcepackagerelease.txt 2009-08-28 07:34:44 +0000
1189@@ -301,7 +301,7 @@
1190 archive, let's say Ubuntu primary archive, it will become publicly
1191 available.
1192
1193- >>> from lp.soyuz.interfaces.publishing import (
1194+ >>> from lp.registry.interfaces.pocket import (
1195 ... PackagePublishingPocket)
1196
1197 >>> public_publication = private_publication.copyTo(
1198
1199=== modified file 'lib/lp/soyuz/doc/soyuz-set-of-uploads.txt'
1200--- lib/lp/soyuz/doc/soyuz-set-of-uploads.txt 2009-07-23 17:49:31 +0000
1201+++ lib/lp/soyuz/doc/soyuz-set-of-uploads.txt 2009-08-28 06:41:25 +0000
1202@@ -624,7 +624,7 @@
1203
1204 >>> from lp.registry.model.sourcepackagename import SourcePackageName
1205 >>> from canonical.launchpad.database import SourcePackageRelease, Build
1206- >>> from canonical.launchpad.interfaces import PackagePublishingPocket
1207+ >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
1208 >>> from canonical.launchpad.interfaces import BuildStatus
1209 >>> spn = SourcePackageName.selectOneBy(name="baz")
1210 >>> spr = SourcePackageRelease.selectOneBy(sourcepackagenameID=spn.id)
1211
1212=== modified file 'lib/lp/soyuz/interfaces/archivedependency.py'
1213--- lib/lp/soyuz/interfaces/archivedependency.py 2009-08-07 23:30:05 +0000
1214+++ lib/lp/soyuz/interfaces/archivedependency.py 2009-08-28 06:39:38 +0000
1215@@ -16,7 +16,7 @@
1216
1217 from canonical.launchpad import _
1218 from lp.soyuz.interfaces.archive import IArchive
1219-from lp.soyuz.interfaces.publishing import PackagePublishingPocket
1220+from lp.registry.interfaces.pocket import PackagePublishingPocket
1221 from lazr.restful.fields import Reference
1222 from lazr.restful.declarations import (
1223 export_as_webservice_entry, exported)
1224
1225=== modified file 'lib/lp/soyuz/interfaces/build.py'
1226--- lib/lp/soyuz/interfaces/build.py 2009-08-14 20:10:50 +0000
1227+++ lib/lp/soyuz/interfaces/build.py 2009-08-28 07:34:44 +0000
1228@@ -26,10 +26,11 @@
1229 from lp.soyuz.interfaces.archive import IArchive
1230 from lp.soyuz.interfaces.builder import IBuilder
1231 from lp.registry.interfaces.distribution import IDistribution
1232+from lp.registry.interfaces.pocket import PackagePublishingPocket
1233 from canonical.launchpad.interfaces.librarian import ILibraryFileAlias
1234 from lp.soyuz.interfaces.processor import IProcessor
1235 from lp.soyuz.interfaces.publishing import (
1236- PackagePublishingPocket, ISourcePackagePublishingHistory)
1237+ ISourcePackagePublishingHistory)
1238 from lp.soyuz.interfaces.sourcepackagerelease import (
1239 ISourcePackageRelease)
1240 from lazr.restful.fields import Reference
1241
1242=== modified file 'lib/lp/soyuz/interfaces/packagecopyrequest.py'
1243--- lib/lp/soyuz/interfaces/packagecopyrequest.py 2009-06-25 04:06:00 +0000
1244+++ lib/lp/soyuz/interfaces/packagecopyrequest.py 2009-08-28 06:40:00 +0000
1245@@ -22,7 +22,7 @@
1246 from lp.soyuz.interfaces.component import IComponent
1247 from lp.registry.interfaces.distroseries import IDistroSeries
1248 from lp.registry.interfaces.person import IPerson
1249-from lp.soyuz.interfaces.publishing import PackagePublishingPocket
1250+from lp.registry.interfaces.pocket import PackagePublishingPocket
1251
1252
1253 class PackageCopyStatus(DBEnumeratedType):
1254
1255=== modified file 'lib/lp/soyuz/interfaces/publishing.py'
1256--- lib/lp/soyuz/interfaces/publishing.py 2009-07-17 00:26:05 +0000
1257+++ lib/lp/soyuz/interfaces/publishing.py 2009-08-28 07:39:05 +0000
1258@@ -19,14 +19,12 @@
1259 'ISourcePackageFilePublishing',
1260 'ISourcePackagePublishingHistory',
1261 'NotInPool',
1262- 'PackagePublishingPocket',
1263 'PackagePublishingPriority',
1264 'PackagePublishingStatus',
1265 'PoolFileOverwriteError',
1266 'active_publishing_status',
1267 'inactive_publishing_status',
1268 'name_priority_map',
1269- 'pocketsuffix'
1270 ]
1271
1272 from zope.schema import Bool, Choice, Datetime, Int, TextLine, Text
1273@@ -36,6 +34,7 @@
1274 from canonical.launchpad import _
1275 from lp.registry.interfaces.distroseries import IDistroSeries
1276 from lp.registry.interfaces.person import IPerson
1277+from lp.registry.interfaces.pocket import PackagePublishingPocket
1278
1279 from lazr.restful.fields import Reference
1280 from lazr.restful.declarations import (
1281@@ -115,57 +114,6 @@
1282 """)
1283
1284
1285-class PackagePublishingPocket(DBEnumeratedType):
1286- """Package Publishing Pocket
1287-
1288- A single distroseries can at its heart be more than one logical
1289- distroseries as the tools would see it. For example there may be a
1290- distroseries called 'hoary' and a SECURITY pocket subset of that would
1291- be referred to as 'hoary-security' by the publisher and the distro side
1292- tools.
1293- """
1294-
1295- RELEASE = DBItem(0, """
1296- Release
1297-
1298- The package versions that were published
1299- when the distribution release was made.
1300- For releases that are still under development,
1301- packages are published here only.
1302- """)
1303-
1304- SECURITY = DBItem(10, """
1305- Security
1306-
1307- Package versions containing security fixes for the released
1308- distribution.
1309- It is a good idea to have security updates turned on for your system.
1310- """)
1311-
1312- UPDATES = DBItem(20, """
1313- Updates
1314-
1315- Package versions including new features after the distribution
1316- release has been made.
1317- Updates are usually turned on by default after a fresh install.
1318- """)
1319-
1320- PROPOSED = DBItem(30, """
1321- Proposed
1322-
1323- Package versions including new functions that should be widely
1324- tested, but that are not yet part of a default installation.
1325- People who "live on the edge" will test these packages before they
1326- are accepted for use in "Updates".
1327- """)
1328-
1329- BACKPORTS = DBItem(40, """
1330- Backports
1331-
1332- Backported packages.
1333- """)
1334-
1335-
1336 class PackagePublishingPriority(DBEnumeratedType):
1337 """Package Publishing Priority
1338
1339@@ -221,7 +169,7 @@
1340 'standard': PackagePublishingPriority.STANDARD,
1341 'optional': PackagePublishingPriority.OPTIONAL,
1342 'extra': PackagePublishingPriority.EXTRA,
1343- '': None
1344+ '': None,
1345 }
1346
1347
1348@@ -229,6 +177,7 @@
1349 # Base Interfaces
1350 #
1351
1352+
1353 class ICanPublishPackages(Interface):
1354 """Denotes the ability to publish associated publishing records."""
1355
1356@@ -420,6 +369,7 @@
1357 # Source package publishing
1358 #
1359
1360+
1361 class ISourcePackageFilePublishing(IFilePublishing):
1362 """Source package release files and their publishing status"""
1363 file_type_name = Attribute(
1364@@ -482,7 +432,7 @@
1365 title=_('Pocket'),
1366 description=_('The pocket into which this entry is published'),
1367 vocabulary=PackagePublishingPocket,
1368- required=True, readonly=True
1369+ required=True, readonly=True,
1370 ))
1371 archive = exported(
1372 Reference(
1373@@ -708,6 +658,7 @@
1374 # Binary package publishing
1375 #
1376
1377+
1378 class IBinaryPackageFilePublishing(IFilePublishing):
1379 """Binary package files and their publishing status"""
1380 # Note that it is really /source/ package name below, and not a
1381@@ -782,7 +733,7 @@
1382 title=_('Pocket'),
1383 description=_('The pocket into which this entry is published'),
1384 vocabulary=PackagePublishingPocket,
1385- required=True, readonly=True
1386+ required=True, readonly=True,
1387 ))
1388 supersededby = Int(
1389 title=_('The build which superseded this one'),
1390@@ -1095,15 +1046,6 @@
1391 the source_package_pub, allowing the use of the cached results.
1392 """
1393
1394-pocketsuffix = {
1395- PackagePublishingPocket.RELEASE: "",
1396- PackagePublishingPocket.SECURITY: "-security",
1397- PackagePublishingPocket.UPDATES: "-updates",
1398- PackagePublishingPocket.PROPOSED: "-proposed",
1399- PackagePublishingPocket.BACKPORTS: "-backports",
1400-}
1401-
1402-
1403 active_publishing_status = (
1404 PackagePublishingStatus.PENDING,
1405 PackagePublishingStatus.PUBLISHED,
1406@@ -1118,4 +1060,3 @@
1407
1408
1409 # Circular import problems fixed in _schema_circular_imports.py
1410-
1411
1412=== modified file 'lib/lp/soyuz/model/archive.py'
1413--- lib/lp/soyuz/model/archive.py 2009-07-31 19:45:21 +0000
1414+++ lib/lp/soyuz/model/archive.py 2009-08-28 07:34:44 +0000
1415@@ -70,12 +70,12 @@
1416 from lp.registry.interfaces.person import PersonVisibility
1417 from canonical.launchpad.interfaces.launchpad import (
1418 ILaunchpadCelebrities, NotFoundError)
1419+from lp.registry.interfaces.pocket import PackagePublishingPocket
1420 from lp.registry.interfaces.role import IHasOwner
1421 from lp.soyuz.interfaces.queue import PackageUploadStatus
1422 from lp.soyuz.interfaces.packagecopyrequest import IPackageCopyRequestSet
1423 from lp.soyuz.interfaces.publishing import (
1424- active_publishing_status, PackagePublishingPocket,
1425- PackagePublishingStatus, IPublishingSet)
1426+ active_publishing_status, PackagePublishingStatus, IPublishingSet)
1427 from lp.registry.interfaces.sourcepackagename import ISourcePackageNameSet
1428 from lp.soyuz.scripts.packagecopier import CannotCopy, do_copy
1429 from canonical.launchpad.webapp.interfaces import (
1430
1431=== modified file 'lib/lp/soyuz/model/archivedependency.py'
1432--- lib/lp/soyuz/model/archivedependency.py 2009-08-04 03:32:34 +0000
1433+++ lib/lp/soyuz/model/archivedependency.py 2009-08-28 06:39:38 +0000
1434@@ -21,7 +21,7 @@
1435 component_dependencies)
1436 from lp.soyuz.interfaces.archivedependency import (
1437 IArchiveDependency)
1438-from lp.soyuz.interfaces.publishing import PackagePublishingPocket
1439+from lp.registry.interfaces.pocket import PackagePublishingPocket
1440
1441
1442 class ArchiveDependency(SQLBase):
1443
1444=== modified file 'lib/lp/soyuz/model/build.py'
1445--- lib/lp/soyuz/model/build.py 2009-07-17 00:26:05 +0000
1446+++ lib/lp/soyuz/model/build.py 2009-08-28 07:34:44 +0000
1447@@ -46,13 +46,13 @@
1448 IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)
1449 from canonical.launchpad.webapp.tales import DurationFormatterAPI
1450 from lp.archivepublisher.utils import get_ppa_reference
1451+from lp.registry.interfaces.pocket import PackagePublishingPocket
1452 from lp.soyuz.adapters.archivedependencies import get_components_for_building
1453 from lp.soyuz.interfaces.archive import ArchivePurpose
1454 from lp.soyuz.interfaces.build import (
1455 BuildStatus, BuildSetStatus, CannotBeRescored, IBuild, IBuildSet)
1456 from lp.soyuz.interfaces.builder import IBuilderSet
1457-from lp.soyuz.interfaces.publishing import (
1458- PackagePublishingPocket, active_publishing_status)
1459+from lp.soyuz.interfaces.publishing import active_publishing_status
1460 from lp.soyuz.model.binarypackagerelease import BinaryPackageRelease
1461 from lp.soyuz.model.builder import Builder
1462 from lp.soyuz.model.buildqueue import BuildQueue
1463
1464=== modified file 'lib/lp/soyuz/model/builder.py'
1465--- lib/lp/soyuz/model/builder.py 2009-07-17 00:26:05 +0000
1466+++ lib/lp/soyuz/model/builder.py 2009-08-28 07:34:44 +0000
1467@@ -37,6 +37,7 @@
1468 get_primary_current_component, get_sources_list_for_building)
1469 from lp.soyuz.model.buildqueue import BuildQueue
1470 from lp.registry.interfaces.person import validate_public_person
1471+from lp.registry.interfaces.pocket import PackagePublishingPocket
1472 from canonical.launchpad.helpers import filenameToContentType
1473 from canonical.launchpad.interfaces._schema_circular_imports import (
1474 IHasBuildRecords)
1475@@ -50,7 +51,7 @@
1476 IBuilder, IBuilderSet, ProtocolVersionMismatch)
1477 from lp.soyuz.interfaces.buildqueue import IBuildQueueSet
1478 from lp.soyuz.interfaces.publishing import (
1479- PackagePublishingPocket, PackagePublishingStatus)
1480+ PackagePublishingStatus)
1481 from canonical.launchpad.webapp import urlappend
1482 from canonical.librarian.utils import copy_and_close
1483
1484
1485=== modified file 'lib/lp/soyuz/model/buildqueue.py'
1486--- lib/lp/soyuz/model/buildqueue.py 2009-07-17 00:26:05 +0000
1487+++ lib/lp/soyuz/model/buildqueue.py 2009-08-28 06:39:38 +0000
1488@@ -30,7 +30,7 @@
1489 from lp.soyuz.interfaces.archive import ArchivePurpose
1490 from lp.soyuz.interfaces.build import BuildStatus
1491 from lp.soyuz.interfaces.buildqueue import IBuildQueue, IBuildQueueSet
1492-from lp.soyuz.interfaces.publishing import PackagePublishingPocket
1493+from lp.registry.interfaces.pocket import PackagePublishingPocket
1494 from canonical.launchpad.webapp.interfaces import (
1495 IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)
1496
1497
1498=== modified file 'lib/lp/soyuz/model/distroarchseries.py'
1499--- lib/lp/soyuz/model/distroarchseries.py 2009-07-17 00:26:05 +0000
1500+++ lib/lp/soyuz/model/distroarchseries.py 2009-08-28 07:34:44 +0000
1501@@ -25,13 +25,14 @@
1502 DecoratedResultSet)
1503 from canonical.launchpad.interfaces._schema_circular_imports import (
1504 IHasBuildRecords)
1505+from lp.registry.interfaces.pocket import PackagePublishingPocket
1506 from lp.soyuz.interfaces.binarypackagename import IBinaryPackageName
1507 from lp.soyuz.interfaces.binarypackagerelease import IBinaryPackageReleaseSet
1508 from lp.soyuz.interfaces.build import IBuildSet
1509 from lp.soyuz.interfaces.distroarchseries import (
1510 IDistroArchSeries, IDistroArchSeriesSet, IPocketChroot)
1511 from lp.soyuz.interfaces.publishing import (
1512- ICanPublishPackages, PackagePublishingPocket, PackagePublishingStatus)
1513+ ICanPublishPackages, PackagePublishingStatus)
1514 from lp.soyuz.model.binarypackagename import BinaryPackageName
1515 from lp.soyuz.model.distroarchseriesbinarypackage import (
1516 DistroArchSeriesBinaryPackage)
1517
1518=== modified file 'lib/lp/soyuz/model/packagecopyrequest.py'
1519--- lib/lp/soyuz/model/packagecopyrequest.py 2009-06-25 04:06:00 +0000
1520+++ lib/lp/soyuz/model/packagecopyrequest.py 2009-08-28 06:39:38 +0000
1521@@ -12,7 +12,7 @@
1522 from canonical.database.constants import UTC_NOW
1523 from lp.soyuz.interfaces.packagecopyrequest import (
1524 PackageCopyStatus, IPackageCopyRequest, IPackageCopyRequestSet)
1525-from lp.soyuz.interfaces.publishing import PackagePublishingPocket
1526+from lp.registry.interfaces.pocket import PackagePublishingPocket
1527 from lp.registry.interfaces.person import validate_public_person
1528 from canonical.launchpad.webapp.interfaces import (
1529 IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)
1530
1531=== modified file 'lib/lp/soyuz/model/publishing.py'
1532--- lib/lp/soyuz/model/publishing.py 2009-07-17 18:46:25 +0000
1533+++ lib/lp/soyuz/model/publishing.py 2009-08-28 07:34:44 +0000
1534@@ -37,6 +37,7 @@
1535 from canonical.database.constants import UTC_NOW
1536 from canonical.database.datetimecol import UtcDateTimeCol
1537 from canonical.database.enumcol import EnumCol
1538+from lp.registry.interfaces.pocket import PackagePublishingPocket
1539 from lp.soyuz.model.binarypackagename import BinaryPackageName
1540 from lp.soyuz.model.files import (
1541 BinaryPackageFile, SourcePackageReleaseFile)
1542@@ -50,9 +51,8 @@
1543 IBinaryPackageFilePublishing, IBinaryPackagePublishingHistory,
1544 IPublishingSet, ISecureBinaryPackagePublishingHistory,
1545 ISecureSourcePackagePublishingHistory, ISourcePackageFilePublishing,
1546- ISourcePackagePublishingHistory, PackagePublishingPocket,
1547- PackagePublishingPriority, PackagePublishingStatus,
1548- PoolFileOverwriteError)
1549+ ISourcePackagePublishingHistory, PackagePublishingPriority,
1550+ PackagePublishingStatus, PoolFileOverwriteError)
1551 from lp.soyuz.interfaces.build import BuildSetStatus, BuildStatus, IBuildSet
1552 from lp.soyuz.scripts.changeoverride import ArchiveOverriderError
1553 from canonical.launchpad.components.decoratedresultset import (
1554
1555=== modified file 'lib/lp/soyuz/model/queue.py'
1556--- lib/lp/soyuz/model/queue.py 2009-07-19 04:41:14 +0000
1557+++ lib/lp/soyuz/model/queue.py 2009-08-16 12:38:12 +0000
1558@@ -56,9 +56,10 @@
1559 from lp.soyuz.interfaces.queue import (
1560 PackageUploadStatus, PackageUploadCustomFormat)
1561 from lp.registry.interfaces.person import IPersonSet
1562+from lp.registry.interfaces.pocket import (
1563+ PackagePublishingPocket, pocketsuffix)
1564 from lp.soyuz.interfaces.publishing import (
1565- ISourcePackagePublishingHistory, PackagePublishingPocket,
1566- PackagePublishingStatus, pocketsuffix)
1567+ ISourcePackagePublishingHistory, PackagePublishingStatus)
1568 from lp.soyuz.interfaces.queue import (
1569 IPackageUpload, IPackageUploadBuild, IPackageUploadCustom,
1570 IPackageUploadQueue, IPackageUploadSource, IPackageUploadSet,
1571
1572=== modified file 'lib/lp/soyuz/scripts/ftpmaster.py'
1573--- lib/lp/soyuz/scripts/ftpmaster.py 2009-08-27 02:00:29 +0000
1574+++ lib/lp/soyuz/scripts/ftpmaster.py 2009-08-30 23:49:54 +0000
1575@@ -39,10 +39,11 @@
1576 from lp.registry.interfaces.distribution import IDistributionSet
1577 from lp.registry.interfaces.distroseries import DistroSeriesStatus
1578 from lp.registry.interfaces.person import IPersonSet
1579+from lp.registry.interfaces.pocket import (
1580+ PackagePublishingPocket, pocketsuffix)
1581 from lp.soyuz.interfaces.binarypackagename import IBinaryPackageNameSet
1582 from lp.soyuz.interfaces.binarypackagerelease import IBinaryPackageReleaseSet
1583-from lp.soyuz.interfaces.publishing import (
1584- PackagePublishingPocket, PackagePublishingStatus, pocketsuffix)
1585+from lp.soyuz.interfaces.publishing import PackagePublishingStatus
1586 from lp.services.scripts.base import (
1587 LaunchpadScript, LaunchpadScriptFailure)
1588 from lp.soyuz.scripts.ftpmasterbase import (
1589
1590=== modified file 'lib/lp/soyuz/scripts/processaccepted.py'
1591--- lib/lp/soyuz/scripts/processaccepted.py 2009-07-19 04:41:14 +0000
1592+++ lib/lp/soyuz/scripts/processaccepted.py 2009-08-28 06:39:38 +0000
1593@@ -18,7 +18,7 @@
1594 from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
1595 from canonical.launchpad.webapp.interfaces import NotFoundError
1596 from lp.soyuz.interfaces.archive import ArchivePurpose
1597-from lp.soyuz.interfaces.publishing import PackagePublishingPocket
1598+from lp.registry.interfaces.pocket import PackagePublishingPocket
1599 from lp.soyuz.interfaces.queue import IPackageUploadSet
1600
1601
1602
1603=== modified file 'lib/lp/soyuz/scripts/queue.py'
1604--- lib/lp/soyuz/scripts/queue.py 2009-07-17 00:26:05 +0000
1605+++ lib/lp/soyuz/scripts/queue.py 2009-08-28 06:39:38 +0000
1606@@ -116,7 +116,7 @@
1607
1608 # Avoid circular imports.
1609 from lp.registry.interfaces.distribution import IDistributionSet
1610- from lp.soyuz.interfaces.publishing import PackagePublishingPocket
1611+ from lp.registry.interfaces.pocket import PackagePublishingPocket
1612
1613 distroset = getUtility(IDistributionSet)
1614 try:
1615
1616=== modified file 'lib/lp/soyuz/scripts/tests/test_archivecruftchecker.py'
1617--- lib/lp/soyuz/scripts/tests/test_archivecruftchecker.py 2009-06-25 04:06:00 +0000
1618+++ lib/lp/soyuz/scripts/tests/test_archivecruftchecker.py 2009-08-28 06:39:38 +0000
1619@@ -19,7 +19,7 @@
1620
1621 from canonical.config import config
1622 from lp.registry.interfaces.distribution import IDistributionSet
1623-from lp.soyuz.interfaces.publishing import PackagePublishingPocket
1624+from lp.registry.interfaces.pocket import PackagePublishingPocket
1625 from lp.soyuz.scripts.ftpmaster import (
1626 ArchiveCruftChecker, ArchiveCruftCheckerError)
1627 from canonical.launchpad.scripts.logger import QuietFakeLogger
1628
1629=== modified file 'lib/lp/soyuz/scripts/tests/test_changeoverride.py'
1630--- lib/lp/soyuz/scripts/tests/test_changeoverride.py 2009-06-25 04:06:00 +0000
1631+++ lib/lp/soyuz/scripts/tests/test_changeoverride.py 2009-08-28 07:34:44 +0000
1632@@ -13,8 +13,8 @@
1633 from lp.registry.interfaces.distribution import IDistributionSet
1634 from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
1635 from lp.registry.interfaces.person import IPersonSet
1636-from lp.soyuz.interfaces.publishing import (
1637- PackagePublishingPocket, PackagePublishingPriority)
1638+from lp.registry.interfaces.pocket import PackagePublishingPocket
1639+from lp.soyuz.interfaces.publishing import PackagePublishingPriority
1640 from lp.soyuz.interfaces.section import ISectionSet
1641 from canonical.launchpad.scripts import FakeLogger
1642 from lp.soyuz.scripts.changeoverride import (
1643
1644=== modified file 'lib/lp/soyuz/scripts/tests/test_copypackage.py'
1645--- lib/lp/soyuz/scripts/tests/test_copypackage.py 2009-08-24 20:09:38 +0000
1646+++ lib/lp/soyuz/scripts/tests/test_copypackage.py 2009-08-28 07:34:44 +0000
1647@@ -25,6 +25,7 @@
1648 from lp.registry.interfaces.distribution import IDistributionSet
1649 from lp.registry.interfaces.distroseries import DistroSeriesStatus
1650 from lp.registry.interfaces.person import IPersonSet
1651+from lp.registry.interfaces.pocket import PackagePublishingPocket
1652 from lp.soyuz.adapters.packagelocation import PackageLocationError
1653 from lp.soyuz.interfaces.archive import (
1654 ArchivePurpose, CannotCopy)
1655@@ -33,8 +34,7 @@
1656 from lp.soyuz.interfaces.component import IComponentSet
1657 from lp.soyuz.interfaces.publishing import (
1658 IBinaryPackagePublishingHistory, ISourcePackagePublishingHistory,
1659- PackagePublishingPocket, PackagePublishingStatus,
1660- active_publishing_status)
1661+ PackagePublishingStatus, active_publishing_status)
1662 from lp.soyuz.interfaces.queue import (
1663 PackageUploadCustomFormat, PackageUploadStatus)
1664 from lp.soyuz.model.publishing import (
1665
1666=== modified file 'lib/lp/soyuz/scripts/tests/test_queue.py'
1667--- lib/lp/soyuz/scripts/tests/test_queue.py 2009-06-25 04:06:00 +0000
1668+++ lib/lp/soyuz/scripts/tests/test_queue.py 2009-08-28 07:34:44 +0000
1669@@ -30,10 +30,10 @@
1670 from lp.registry.interfaces.distribution import IDistributionSet
1671 from lp.registry.interfaces.distroseries import DistroSeriesStatus
1672 from lp.registry.interfaces.person import IPersonSet
1673+from lp.registry.interfaces.pocket import PackagePublishingPocket
1674 from lp.soyuz.interfaces.archive import ArchivePurpose, IArchiveSet
1675 from lp.soyuz.interfaces.queue import PackageUploadStatus
1676-from lp.soyuz.interfaces.publishing import (
1677- PackagePublishingPocket, PackagePublishingStatus)
1678+from lp.soyuz.interfaces.publishing import PackagePublishingStatus
1679 from lp.soyuz.interfaces.queue import IPackageUploadSet
1680 from lp.services.mail import stub
1681 from lp.soyuz.scripts.queue import (
1682
1683=== modified file 'lib/lp/soyuz/stories/ppa/xx-ppa-files.txt'
1684--- lib/lp/soyuz/stories/ppa/xx-ppa-files.txt 2009-08-19 15:15:25 +0000
1685+++ lib/lp/soyuz/stories/ppa/xx-ppa-files.txt 2009-08-28 07:34:44 +0000
1686@@ -14,8 +14,6 @@
1687 >>> from lp.soyuz.tests.test_publishing import (
1688 ... SoyuzTestPublisher)
1689 >>> from lp.registry.interfaces.person import IPersonSet
1690- >>> from lp.soyuz.interfaces.publishing import (
1691- ... PackagePublishingPocket)
1692
1693 Make the PPA private.
1694
1695
1696=== modified file 'lib/lp/soyuz/stories/soyuz/xx-binarypackagerelease-index.txt'
1697--- lib/lp/soyuz/stories/soyuz/xx-binarypackagerelease-index.txt 2009-08-19 12:54:20 +0000
1698+++ lib/lp/soyuz/stories/soyuz/xx-binarypackagerelease-index.txt 2009-08-28 07:34:44 +0000
1699@@ -22,7 +22,7 @@
1700
1701 >>> from lp.soyuz.model.queue import PackageUploadBuild
1702 >>> from lp.soyuz.interfaces.build import IBuildSet
1703- >>> from lp.soyuz.interfaces.publishing import (
1704+ >>> from lp.registry.interfaces.pocket import (
1705 ... PackagePublishingPocket)
1706 >>> from zope.component import getUtility
1707
1708
1709=== modified file 'lib/lp/soyuz/stories/soyuz/xx-build-record.txt'
1710--- lib/lp/soyuz/stories/soyuz/xx-build-record.txt 2009-08-27 08:32:39 +0000
1711+++ lib/lp/soyuz/stories/soyuz/xx-build-record.txt 2009-08-30 23:49:54 +0000
1712@@ -271,7 +271,7 @@
1713 # Mark the testing build as FULLYBUILT and upload a corresponding
1714 # binary package for it which will be awaiting for acceptance.
1715 >>> login('foo.bar@canonical.com')
1716- >>> from lp.soyuz.interfaces.publishing import PackagePublishingPocket
1717+ >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
1718 >>> build.buildqueue_record.destroySelf()
1719 >>> build.buildstate = BuildStatus.FULLYBUILT
1720 >>> build.builder = bob_builder
1721
1722=== modified file 'lib/lp/soyuz/stories/soyuz/xx-queue-pages-delayed-copies.txt'
1723--- lib/lp/soyuz/stories/soyuz/xx-queue-pages-delayed-copies.txt 2009-07-16 18:07:13 +0000
1724+++ lib/lp/soyuz/stories/soyuz/xx-queue-pages-delayed-copies.txt 2009-08-28 06:39:38 +0000
1725@@ -9,7 +9,7 @@
1726 >>> from zope.component import getUtility
1727 >>> from lp.registry.interfaces.distribution import IDistributionSet
1728 >>> from lp.registry.interfaces.person import IPersonSet
1729- >>> from lp.soyuz.interfaces.publishing import PackagePublishingPocket
1730+ >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
1731 >>> from lp.soyuz.interfaces.queue import IPackageUploadSet
1732 >>> from lp.soyuz.tests.test_publishing import SoyuzTestPublisher
1733 >>> login('foo.bar@canonical.com')
1734
1735=== modified file 'lib/lp/soyuz/stories/webservice/xx-archive.txt'
1736--- lib/lp/soyuz/stories/webservice/xx-archive.txt 2009-08-13 15:12:16 +0000
1737+++ lib/lp/soyuz/stories/webservice/xx-archive.txt 2009-08-28 06:39:38 +0000
1738@@ -894,7 +894,7 @@
1739 cprov's PPA. We can't do this through the webservice yet.
1740
1741 >>> from lp.soyuz.interfaces.component import IComponentSet
1742- >>> from lp.soyuz.interfaces.publishing import PackagePublishingPocket
1743+ >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
1744 >>> login('foo.bar@canonical.com')
1745 >>> cprov_ppa_db = getUtility(IPersonSet).getByName('cprov').archive
1746 >>> dep = cprov_ppa_db.addArchiveDependency(
1747
1748=== modified file 'lib/lp/soyuz/stories/webservice/xx-archivedependency.txt'
1749--- lib/lp/soyuz/stories/webservice/xx-archivedependency.txt 2009-08-13 15:12:16 +0000
1750+++ lib/lp/soyuz/stories/webservice/xx-archivedependency.txt 2009-08-28 06:39:38 +0000
1751@@ -14,7 +14,7 @@
1752 >>> from zope.component import getUtility
1753 >>> from lp.registry.interfaces.person import IPersonSet
1754 >>> from lp.soyuz.interfaces.component import IComponentSet
1755- >>> from lp.soyuz.interfaces.publishing import PackagePublishingPocket
1756+ >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
1757 >>> login('foo.bar@canonical.com')
1758 >>> cprov_db = getUtility(IPersonSet).getByName('cprov')
1759 >>> cprov_ppa_db = cprov_db.archive
1760
1761=== modified file 'lib/lp/soyuz/stories/webservice/xx-packageupload.txt'
1762--- lib/lp/soyuz/stories/webservice/xx-packageupload.txt 2009-07-02 10:10:31 +0000
1763+++ lib/lp/soyuz/stories/webservice/xx-packageupload.txt 2009-08-28 06:39:38 +0000
1764@@ -42,7 +42,7 @@
1765 First, insert some data to retrieve:
1766
1767 >>> login("admin@canonical.com")
1768- >>> from lp.soyuz.interfaces.publishing import PackagePublishingPocket
1769+ >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
1770 >>> from lp.soyuz.interfaces.queue import PackageUploadCustomFormat
1771 >>> from lp.registry.interfaces.distribution import IDistributionSet
1772 >>> from zope.component import getUtility
1773
1774=== modified file 'lib/lp/soyuz/tests/ppa.py'
1775--- lib/lp/soyuz/tests/ppa.py 2009-06-25 04:06:00 +0000
1776+++ lib/lp/soyuz/tests/ppa.py 2009-08-28 07:34:44 +0000
1777@@ -20,11 +20,11 @@
1778 from lp.soyuz.interfaces.component import IComponentSet
1779 from lp.registry.interfaces.distribution import IDistributionSet
1780 from lp.registry.interfaces.person import IPersonSet
1781+from lp.registry.interfaces.pocket import PackagePublishingPocket
1782 from lp.registry.interfaces.sourcepackagename import ISourcePackageNameSet
1783 from lp.soyuz.interfaces.binarypackagename import IBinaryPackageNameSet
1784 from lp.soyuz.interfaces.publishing import (
1785- PackagePublishingPocket, PackagePublishingPriority,
1786- PackagePublishingStatus)
1787+ PackagePublishingPriority, PackagePublishingStatus)
1788
1789
1790 def publishToTeamPPA(team_name=None, distroseries_name=None,
1791
1792=== modified file 'lib/lp/soyuz/tests/soyuz.py'
1793--- lib/lp/soyuz/tests/soyuz.py 2009-06-25 04:06:00 +0000
1794+++ lib/lp/soyuz/tests/soyuz.py 2009-08-28 07:34:44 +0000
1795@@ -17,8 +17,10 @@
1796 from canonical.launchpad.ftests import syncUpdate
1797 from lp.registry.interfaces.distribution import IDistributionSet
1798 from lp.registry.interfaces.person import IPersonSet
1799-from lp.soyuz.interfaces.publishing import (
1800- PackagePublishingPocket, PackagePublishingStatus)
1801+from lp.registry.interfaces.pocket import PackagePublishingPocket
1802+from lp.soyuz.interfaces.publishing import PackagePublishingStatus
1803+
1804+
1805 class SoyuzTestHelper:
1806 """Helper class to support easier tests in Soyuz component."""
1807
1808
1809=== modified file 'lib/lp/soyuz/tests/test_packageupload.py'
1810--- lib/lp/soyuz/tests/test_packageupload.py 2009-07-19 04:41:14 +0000
1811+++ lib/lp/soyuz/tests/test_packageupload.py 2009-08-28 07:34:44 +0000
1812@@ -15,10 +15,10 @@
1813 from lp.archiveuploader.tests import datadir
1814 from lp.registry.interfaces.distribution import IDistributionSet
1815 from lp.registry.interfaces.distroseries import DistroSeriesStatus
1816+from lp.registry.interfaces.pocket import PackagePublishingPocket
1817 from lp.soyuz.interfaces.archive import ArchivePurpose
1818 from lp.soyuz.interfaces.build import BuildStatus
1819-from lp.soyuz.interfaces.publishing import (
1820- PackagePublishingPocket, PackagePublishingStatus)
1821+from lp.soyuz.interfaces.publishing import PackagePublishingStatus
1822 from lp.soyuz.interfaces.queue import (
1823 IPackageUploadSet, PackageUploadCustomFormat, PackageUploadStatus)
1824 from lp.soyuz.tests.test_publishing import SoyuzTestPublisher
1825
1826=== modified file 'lib/lp/soyuz/tests/test_publishing.py'
1827--- lib/lp/soyuz/tests/test_publishing.py 2009-07-19 04:41:14 +0000
1828+++ lib/lp/soyuz/tests/test_publishing.py 2009-08-28 07:34:44 +0000
1829@@ -28,6 +28,7 @@
1830 from canonical.launchpad.webapp.interfaces import NotFoundError
1831 from lp.registry.interfaces.distribution import IDistributionSet
1832 from lp.registry.interfaces.person import IPersonSet
1833+from lp.registry.interfaces.pocket import PackagePublishingPocket
1834 from lp.registry.interfaces.sourcepackage import SourcePackageUrgency
1835 from lp.registry.interfaces.sourcepackagename import ISourcePackageNameSet
1836 from lp.soyuz.interfaces.archive import ArchivePurpose
1837@@ -35,8 +36,7 @@
1838 from lp.soyuz.interfaces.binarypackagerelease import BinaryPackageFormat
1839 from lp.soyuz.interfaces.build import BuildStatus
1840 from lp.soyuz.interfaces.publishing import (
1841- PackagePublishingPocket, PackagePublishingPriority,
1842- PackagePublishingStatus)
1843+ PackagePublishingPriority, PackagePublishingStatus)
1844 from canonical.launchpad.scripts import FakeLogger
1845 from lp.testing import TestCaseWithFactory
1846 from lp.testing.factory import LaunchpadObjectFactory
1847
1848=== modified file 'lib/lp/soyuz/tests/test_publishing_top_level_api.py'
1849--- lib/lp/soyuz/tests/test_publishing_top_level_api.py 2009-06-25 04:06:00 +0000
1850+++ lib/lp/soyuz/tests/test_publishing_top_level_api.py 2009-08-28 07:34:44 +0000
1851@@ -8,8 +8,10 @@
1852 from lp.soyuz.tests.test_publishing import TestNativePublishingBase
1853
1854 from lp.registry.interfaces.distroseries import DistroSeriesStatus
1855-from lp.soyuz.interfaces.publishing import (
1856- PackagePublishingPocket, PackagePublishingStatus)
1857+from lp.registry.interfaces.pocket import PackagePublishingPocket
1858+from lp.soyuz.interfaces.publishing import PackagePublishingStatus
1859+
1860+
1861 class TestICanPublishPackagesAPI(TestNativePublishingBase):
1862
1863 def _createLinkedPublication(self, name, pocket):
1864
1865=== modified file 'lib/lp/testing/factory.py'
1866--- lib/lp/testing/factory.py 2009-08-29 19:37:54 +0000
1867+++ lib/lp/testing/factory.py 2009-08-30 23:49:54 +0000
1868@@ -57,7 +57,7 @@
1869 from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
1870 from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
1871 from lp.translations.interfaces.potemplate import IPOTemplateSet
1872-from lp.soyuz.interfaces.publishing import PackagePublishingPocket
1873+from lp.registry.interfaces.pocket import PackagePublishingPocket
1874 from lp.blueprints.interfaces.specification import (
1875 ISpecificationSet, SpecificationDefinitionStatus)
1876 from lp.translations.interfaces.translationgroup import (
1877
1878=== modified file 'scripts/ftpmaster-tools/archive-override-check.py'
1879--- scripts/ftpmaster-tools/archive-override-check.py 2009-06-30 16:56:07 +0000
1880+++ scripts/ftpmaster-tools/archive-override-check.py 2009-08-28 07:34:44 +0000
1881@@ -22,9 +22,9 @@
1882 from canonical.launchpad.interfaces import NotFoundError
1883 from canonical.lp import initZopeless
1884 from lp.registry.interfaces.distribution import IDistributionSet
1885+from lp.registry.interfaces.pocket import PackagePublishingPocket
1886 from lp.soyuz.scripts.ftpmaster import PubSourceChecker
1887-from lp.soyuz.interfaces.publishing import (
1888- PackagePublishingStatus, PackagePublishingPocket)
1889+from lp.soyuz.interfaces.publishing import PackagePublishingStatus
1890
1891 from contrib.glock import GlobalLock
1892
1893
1894=== modified file 'scripts/ftpmaster-tools/buildd-mass-retry.py'
1895--- scripts/ftpmaster-tools/buildd-mass-retry.py 2009-06-30 16:56:07 +0000
1896+++ scripts/ftpmaster-tools/buildd-mass-retry.py 2009-08-28 06:39:38 +0000
1897@@ -22,7 +22,7 @@
1898 from canonical.launchpad.interfaces import NotFoundError
1899 from lp.registry.interfaces.distribution import IDistributionSet
1900 from lp.soyuz.interfaces.build import BuildStatus
1901-from lp.soyuz.interfaces.publishing import PackagePublishingPocket
1902+from lp.registry.interfaces.pocket import PackagePublishingPocket
1903 from canonical.launchpad.scripts import (
1904 execute_zcml_for_scripts, logger_options, logger)
1905 from canonical.lp import initZopeless
1906
1907=== modified file 'scripts/ftpmaster-tools/initialise-from-parent.py'
1908--- scripts/ftpmaster-tools/initialise-from-parent.py 2009-06-30 16:56:07 +0000
1909+++ scripts/ftpmaster-tools/initialise-from-parent.py 2009-08-28 06:39:38 +0000
1910@@ -107,8 +107,8 @@
1911 via initialiseFromParent method.
1912 """
1913 # Avoid circular import.
1914+ from lp.registry.interfaces.pocket import PackagePublishingPocket
1915 from lp.soyuz.interfaces.build import BuildStatus
1916- from lp.soyuz.interfaces.publishing import PackagePublishingPocket
1917
1918 parentseries = distroseries.parent_series
1919
1920@@ -127,7 +127,7 @@
1921 via initialiseFromParent method.
1922 """
1923 # Avoid circular import.
1924- from lp.soyuz.interfaces.publishing import PackagePublishingPocket
1925+ from lp.registry.interfaces.pocket import PackagePublishingPocket
1926
1927 parentseries = distroseries.parent_series
1928
1929
1930=== modified file 'scripts/ftpmaster-tools/sync-source.py'
1931--- scripts/ftpmaster-tools/sync-source.py 2009-07-23 02:33:14 +0000
1932+++ scripts/ftpmaster-tools/sync-source.py 2009-08-28 07:34:44 +0000
1933@@ -38,12 +38,12 @@
1934
1935 from canonical.database.sqlbase import sqlvalues, cursor
1936 from canonical.launchpad.interfaces import (
1937- IDistributionSet, IPersonSet, PackagePublishingStatus,
1938- PackagePublishingPocket)
1939+ IDistributionSet, IPersonSet, PackagePublishingStatus)
1940 from canonical.launchpad.scripts import (
1941 execute_zcml_for_scripts, logger, logger_options)
1942 from canonical.librarian.client import LibrarianClient
1943 from canonical.lp import initZopeless
1944+from lp.registry.interfaces.pocket import PackagePublishingPocket
1945
1946
1947 reject_message = ""
1948
1949=== modified file 'scripts/gina.py'
1950--- scripts/gina.py 2009-06-30 16:56:07 +0000
1951+++ scripts/gina.py 2009-08-28 06:39:38 +0000
1952@@ -117,7 +117,7 @@
1953
1954 def run_gina(options, ztm, target_section):
1955 # Avoid circular imports.
1956- from lp.soyuz.interfaces.publishing import PackagePublishingPocket
1957+ from lp.registry.interfaces.pocket import PackagePublishingPocket
1958
1959 package_root = target_section.root
1960 keyrings_root = target_section.keyrings