Merge lp:~henninge/launchpad/devel-remove-c-l-i into lp:launchpad
- devel-remove-c-l-i
- Merge into devel
Proposed by
Henning Eggers
Status: | Rejected |
---|---|
Rejected by: | Henning Eggers |
Proposed branch: | lp:~henninge/launchpad/devel-remove-c-l-i |
Merge into: | lp:launchpad |
Diff against target: |
641 lines (+106/-71) 37 files modified
lib/lp/translations/browser/pofile.py (+1/-1) lib/lp/translations/browser/tests/distroseries-views.txt (+5/-3) lib/lp/translations/browser/tests/translationimportqueue-views.txt (+1/-1) lib/lp/translations/doc/canonical_url_examples.txt (+4/-3) lib/lp/translations/doc/distroseries-language.txt (+3/-2) lib/lp/translations/doc/language-pack.txt (+1/-2) lib/lp/translations/doc/poexport-language-pack.txt (+2/-1) lib/lp/translations/doc/poexport-queue.txt (+1/-1) lib/lp/translations/doc/pofile.txt (+7/-4) lib/lp/translations/doc/poimport-pofile-not-exported-from-rosetta.txt (+3/-2) lib/lp/translations/doc/poimport-pofile-old-po-imported.txt (+3/-2) lib/lp/translations/doc/poimport-pofile-syntax-error.txt (+3/-2) lib/lp/translations/doc/poimport-potemplate-syntax-error.txt (+3/-2) lib/lp/translations/doc/poimport.txt (+5/-2) lib/lp/translations/doc/potmsgset.txt (+4/-4) lib/lp/translations/doc/request_country.txt (+1/-1) lib/lp/translations/doc/rosetta-karma.txt (+3/-2) lib/lp/translations/doc/rosetta-poimport-script.txt (+3/-2) lib/lp/translations/doc/sourcepackagerelease-translations.txt (+2/-1) lib/lp/translations/doc/translationgroup.txt (+3/-3) lib/lp/translations/doc/translationimportqueue.txt (+9/-4) lib/lp/translations/doc/translationmessage.txt (+2/-2) lib/lp/translations/doc/translationsoverview.txt (+4/-3) lib/lp/translations/doc/translationsperson.txt (+1/-1) lib/lp/translations/doc/translationtemplatesbuildbehavior.txt (+4/-2) lib/lp/translations/doc/vpoexport.txt (+1/-1) lib/lp/translations/model/translationtemplatesbuildbehavior.py (+1/-1) lib/lp/translations/model/translationtemplatesbuildjob.py (+1/-1) lib/lp/translations/stories/productseries/xx-productseries-translations.txt (+5/-3) lib/lp/translations/stories/standalone/xx-pofile-translate-message-filtering.txt (+3/-2) lib/lp/translations/stories/standalone/xx-serieslanguage-index.txt (+2/-1) lib/lp/translations/stories/standalone/xx-sourcepackage-export.txt (+5/-2) lib/lp/translations/stories/standalone/xx-translationmessage-translate.txt (+4/-2) lib/lp/translations/stories/translationgroups/60-translation-suggestions.txt (+3/-2) lib/lp/translations/tests/potmsgset-update-translation.txt (+1/-1) lib/lp/translations/tests/test_translationtemplatesbuildbehavior.py (+1/-1) lib/lp/translations/tests/test_translationtemplatesbuildjob.py (+1/-1) |
To merge this branch: | bzr merge lp:~henninge/launchpad/devel-remove-c-l-i |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Gavin Panella (community) | Approve | ||
Review via email: mp+37116@code.launchpad.net |
Commit message
Import interfaces from the right places in lp.translations.
Description of the change
Removed all "from canonical.
To post a comment you must log in.
Revision history for this message
Brad Crittenden (bac) wrote : | # |
Is this branch ready to land or are you blocked? If the branch is abandoned please change the MP status to 'Rejected'.
Revision history for this message
Henning Eggers (henninge) wrote : | # |
Yes, the branch is abandoned. I gave up on this and I can't exactly why atm.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'lib/lp/translations/browser/pofile.py' |
2 | --- lib/lp/translations/browser/pofile.py 2010-08-31 11:11:09 +0000 |
3 | +++ lib/lp/translations/browser/pofile.py 2010-10-04 09:44:48 +0000 |
4 | @@ -26,7 +26,6 @@ |
5 | |
6 | from canonical.config import config |
7 | from canonical.launchpad import _ |
8 | -from canonical.launchpad.interfaces import ILaunchBag |
9 | from canonical.launchpad.webapp import ( |
10 | canonical_url, |
11 | enabled_with_permission, |
12 | @@ -36,6 +35,7 @@ |
13 | NavigationMenu, |
14 | ) |
15 | from canonical.launchpad.webapp.batching import BatchNavigator |
16 | +from canonical.launchpad.webapp.interfaces import ILaunchBag |
17 | from canonical.launchpad.webapp.menu import structured |
18 | from canonical.lazr.utils import smartquote |
19 | from lp.app.errors import ( |
20 | |
21 | === modified file 'lib/lp/translations/browser/tests/distroseries-views.txt' |
22 | --- lib/lp/translations/browser/tests/distroseries-views.txt 2010-08-02 23:34:01 +0000 |
23 | +++ lib/lp/translations/browser/tests/distroseries-views.txt 2010-10-04 09:44:48 +0000 |
24 | @@ -4,7 +4,7 @@ |
25 | Let's use ubuntu/hoary for these tests. |
26 | |
27 | >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest |
28 | - >>> from canonical.launchpad.interfaces import IDistributionSet |
29 | + >>> from lp.registry.interfaces.distribution import IDistributionSet |
30 | >>> from lp.registry.interfaces.series import SeriesStatus |
31 | >>> ubuntu = getUtility(IDistributionSet).getByName('ubuntu') |
32 | >>> hoary = ubuntu.getSeries('hoary') |
33 | @@ -25,8 +25,10 @@ |
34 | >>> from zope.security.proxy import removeSecurityProxy |
35 | >>> from lp.translations.browser.distroseries import ( |
36 | ... DistroSeriesView) |
37 | - >>> from canonical.launchpad.interfaces import ( |
38 | - ... ILaunchpadCelebrities, ITeamMembershipSet, TeamMembershipStatus) |
39 | + >>> from canonical.launchpad.interfaces.launchpad import ( |
40 | + ... ILaunchpadCelebrities) |
41 | + >>> from lp.registry.interfaces.teammembership import ( |
42 | + ... ITeamMembershipSet, TeamMembershipStatus) |
43 | >>> from lp.app.errors import TranslationUnavailable |
44 | |
45 | >>> def check_translations_access(distroseries): |
46 | |
47 | === modified file 'lib/lp/translations/browser/tests/translationimportqueue-views.txt' |
48 | --- lib/lp/translations/browser/tests/translationimportqueue-views.txt 2010-07-21 05:41:41 +0000 |
49 | +++ lib/lp/translations/browser/tests/translationimportqueue-views.txt 2010-10-04 09:44:48 +0000 |
50 | @@ -153,7 +153,7 @@ |
51 | |
52 | The Ubuntu distribution gets special treatment for the language pack flag. |
53 | |
54 | - >>> from canonical.launchpad.interfaces import ( |
55 | + >>> from canonical.launchpad.interfaces.launchpad import ( |
56 | ... ILaunchpadCelebrities) |
57 | >>> ubuntu = getUtility(ILaunchpadCelebrities).ubuntu |
58 | >>> ubuntuseries = factory.makeDistroRelease(ubuntu) |
59 | |
60 | === modified file 'lib/lp/translations/doc/canonical_url_examples.txt' |
61 | --- lib/lp/translations/doc/canonical_url_examples.txt 2010-07-19 15:35:31 +0000 |
62 | +++ lib/lp/translations/doc/canonical_url_examples.txt 2010-10-04 09:44:48 +0000 |
63 | @@ -11,7 +11,8 @@ |
64 | |
65 | The Rosetta homepage. |
66 | |
67 | - >>> from canonical.launchpad.interfaces import IRosettaApplication |
68 | + >>> from canonical.launchpad.interfaces.launchpad import ( |
69 | + ... IRosettaApplication) |
70 | >>> canonical_url(getUtility(IRosettaApplication)) |
71 | u'http://launchpad.dev/translations' |
72 | |
73 | @@ -29,7 +30,7 @@ |
74 | |
75 | >>> from lp.registry.interfaces.sourcepackagename import ( |
76 | ... ISourcePackageNameSet) |
77 | - >>> from canonical.launchpad.interfaces import IDistributionSet |
78 | + >>> from lp.registry.interfaces.distribution import IDistributionSet |
79 | >>> sourcepackagenameset = getUtility(ISourcePackageNameSet) |
80 | >>> sourcepackagename = sourcepackagenameset['evolution'] |
81 | >>> distroset = getUtility(IDistributionSet) |
82 | @@ -81,7 +82,7 @@ |
83 | Now we can get an upstream subset and do the same sorts of thing as we did |
84 | with the distro subset. |
85 | |
86 | - >>> from canonical.launchpad.interfaces import IProductSet |
87 | + >>> from lp.registry.interfaces.product import IProductSet |
88 | >>> productset = getUtility(IProductSet) |
89 | >>> evolution_product = productset['evolution'] |
90 | >>> evolution_trunk_series = evolution_product.getSeries('trunk') |
91 | |
92 | === modified file 'lib/lp/translations/doc/distroseries-language.txt' |
93 | --- lib/lp/translations/doc/distroseries-language.txt 2010-08-06 07:40:52 +0000 |
94 | +++ lib/lp/translations/doc/distroseries-language.txt 2010-10-04 09:44:48 +0000 |
95 | @@ -7,8 +7,9 @@ |
96 | will work with spanish in Hoary first. |
97 | |
98 | >>> from zope.component import getUtility |
99 | - >>> from canonical.launchpad.interfaces import ( |
100 | - ... IDistroSeriesSet, IDistributionSet, ILanguageSet) |
101 | + >>> from lp.registry.interfaces.distroseries import IDistroSeriesSet |
102 | + >>> from lp.registry.interfaces.distribution import IDistributionSet |
103 | + >>> from lp.services.worlddata.interfaces.language import ILanguageSet |
104 | >>> from lp.translations.interfaces.distroserieslanguage import ( |
105 | ... IDistroSeriesLanguage) |
106 | >>> distroseriesset = getUtility(IDistroSeriesSet) |
107 | |
108 | === modified file 'lib/lp/translations/doc/language-pack.txt' |
109 | --- lib/lp/translations/doc/language-pack.txt 2009-07-02 17:16:50 +0000 |
110 | +++ lib/lp/translations/doc/language-pack.txt 2010-10-04 09:44:48 +0000 |
111 | @@ -11,8 +11,7 @@ |
112 | >>> from cStringIO import StringIO |
113 | >>> from zope.component import getUtility |
114 | >>> from zope.interface import providedBy |
115 | - >>> from canonical.launchpad.interfaces import ( |
116 | - ... IDistributionSet) |
117 | + >>> from lp.registry.interfaces.distribution import IDistributionSet |
118 | >>> from lp.translations.interfaces.languagepack import ( |
119 | ... ILanguagePack, |
120 | ... ILanguagePackSet, |
121 | |
122 | === modified file 'lib/lp/translations/doc/poexport-language-pack.txt' |
123 | --- lib/lp/translations/doc/poexport-language-pack.txt 2010-04-28 05:40:02 +0000 |
124 | +++ lib/lp/translations/doc/poexport-language-pack.txt 2010-10-04 09:44:48 +0000 |
125 | @@ -12,7 +12,8 @@ |
126 | >>> import transaction |
127 | >>> from canonical.launchpad.ftests import login |
128 | >>> from canonical.launchpad.helpers import string_to_tarfile |
129 | - >>> from canonical.launchpad.interfaces import ILaunchpadCelebrities |
130 | + >>> from canonical.launchpad.interfaces.launchpad import ( |
131 | + ... ILaunchpadCelebrities) |
132 | >>> from lp.translations.scripts.language_pack import \ |
133 | ... export_language_pack |
134 | >>> from canonical.librarian.interfaces import ILibrarianClient |
135 | |
136 | === modified file 'lib/lp/translations/doc/poexport-queue.txt' |
137 | --- lib/lp/translations/doc/poexport-queue.txt 2010-03-05 15:31:22 +0000 |
138 | +++ lib/lp/translations/doc/poexport-queue.txt 2010-10-04 09:44:48 +0000 |
139 | @@ -11,7 +11,7 @@ |
140 | |
141 | >>> import transaction |
142 | >>> from zope.component import getUtility |
143 | - >>> from canonical.launchpad.interfaces import IPersonSet |
144 | + >>> from lp.registry.interfaces.person import IPersonSet |
145 | >>> from lp.testing.faketransaction import FakeTransaction |
146 | >>> from lp.testing.mail_helpers import pop_notifications, print_emails |
147 | >>> from lp.translations.scripts.po_export_queue import ExportResult |
148 | |
149 | === modified file 'lib/lp/translations/doc/pofile.txt' |
150 | --- lib/lp/translations/doc/pofile.txt 2010-09-01 10:03:11 +0000 |
151 | +++ lib/lp/translations/doc/pofile.txt 2010-10-04 09:44:48 +0000 |
152 | @@ -6,9 +6,11 @@ |
153 | >>> import pytz |
154 | >>> from zope.component import getUtility |
155 | >>> from canonical.launchpad.webapp.testing import verifyObject |
156 | - >>> from canonical.launchpad.interfaces import ( |
157 | - ... IDistributionSet, ILanguageSet, IPersonSet, |
158 | + >>> from lp.registry.interfaces.distribution import IDistributionSet |
159 | + >>> from lp.registry.interfaces.person import IPersonSet |
160 | + >>> from lp.registry.interfaces.sourcepackagename import ( |
161 | ... ISourcePackageNameSet) |
162 | + >>> from lp.services.worlddata.interfaces.language import ILanguageSet |
163 | >>> from lp.translations.interfaces.pofile import IPOFile |
164 | >>> from lp.translations.interfaces.potemplate import IPOTemplateSet |
165 | >>> sourcepackagenameset = getUtility(ISourcePackageNameSet) |
166 | @@ -367,8 +369,9 @@ |
167 | |
168 | Do some needed imports. |
169 | |
170 | - >>> from canonical.launchpad.interfaces import ILaunchpadCelebrities |
171 | - >>> from canonical.launchpad.interfaces import IProductSet |
172 | + >>> from canonical.launchpad.interfaces.launchpad import ( |
173 | + ... ILaunchpadCelebrities) |
174 | + >>> from lp.registry.interfaces.product import IProductSet |
175 | >>> from lp.translations.interfaces.translationgroup import ( |
176 | ... ITranslationGroupSet, TranslationPermission) |
177 | >>> from lp.translations.model.pofile import POFile |
178 | |
179 | === modified file 'lib/lp/translations/doc/poimport-pofile-not-exported-from-rosetta.txt' |
180 | --- lib/lp/translations/doc/poimport-pofile-not-exported-from-rosetta.txt 2009-11-17 09:50:33 +0000 |
181 | +++ lib/lp/translations/doc/poimport-pofile-not-exported-from-rosetta.txt 2010-10-04 09:44:48 +0000 |
182 | @@ -19,8 +19,9 @@ |
183 | |
184 | Here are some imports we need to get this test running. |
185 | |
186 | - >>> from canonical.launchpad.interfaces import ( |
187 | - ... ILaunchpadCelebrities, IPersonSet) |
188 | + >>> from canonical.launchpad.interfaces.launchpad import ( |
189 | + ... ILaunchpadCelebrities) |
190 | + >>> from lp.registry.interfaces.person import IPersonSet |
191 | >>> from lp.translations.interfaces.translationimportqueue import ( |
192 | ... ITranslationImportQueue, RosettaImportStatus) |
193 | >>> from lp.translations.model.potemplate import POTemplateSubset |
194 | |
195 | === modified file 'lib/lp/translations/doc/poimport-pofile-old-po-imported.txt' |
196 | --- lib/lp/translations/doc/poimport-pofile-old-po-imported.txt 2009-11-17 09:50:33 +0000 |
197 | +++ lib/lp/translations/doc/poimport-pofile-old-po-imported.txt 2010-10-04 09:44:48 +0000 |
198 | @@ -16,8 +16,9 @@ |
199 | |
200 | Here are some imports we need to get this test running. |
201 | |
202 | - >>> from canonical.launchpad.interfaces import ( |
203 | - ... ILaunchpadCelebrities, IPersonSet) |
204 | + >>> from canonical.launchpad.interfaces.launchpad import ( |
205 | + ... ILaunchpadCelebrities) |
206 | + >>> from lp.registry.interfaces.person import IPersonSet |
207 | >>> from lp.translations.interfaces.translationimportqueue import ( |
208 | ... ITranslationImportQueue) |
209 | >>> from lp.translations.model.potemplate import POTemplateSubset |
210 | |
211 | === modified file 'lib/lp/translations/doc/poimport-pofile-syntax-error.txt' |
212 | --- lib/lp/translations/doc/poimport-pofile-syntax-error.txt 2009-11-17 09:50:33 +0000 |
213 | +++ lib/lp/translations/doc/poimport-pofile-syntax-error.txt 2010-10-04 09:44:48 +0000 |
214 | @@ -7,8 +7,9 @@ |
215 | |
216 | Here are some imports we need to get this test running. |
217 | |
218 | - >>> from canonical.launchpad.interfaces import ( |
219 | - ... ILaunchpadCelebrities, IPersonSet) |
220 | + >>> from canonical.launchpad.interfaces.launchpad import ( |
221 | + ... ILaunchpadCelebrities) |
222 | + >>> from lp.registry.interfaces.person import IPersonSet |
223 | >>> from lp.translations.interfaces.translationimportqueue import ( |
224 | ... ITranslationImportQueue) |
225 | >>> from lp.translations.model.potemplate import POTemplateSubset |
226 | |
227 | === modified file 'lib/lp/translations/doc/poimport-potemplate-syntax-error.txt' |
228 | --- lib/lp/translations/doc/poimport-potemplate-syntax-error.txt 2009-11-17 09:50:33 +0000 |
229 | +++ lib/lp/translations/doc/poimport-potemplate-syntax-error.txt 2010-10-04 09:44:48 +0000 |
230 | @@ -7,8 +7,9 @@ |
231 | |
232 | Here are some imports we need to get this test running. |
233 | |
234 | - >>> from canonical.launchpad.interfaces import ( |
235 | - ... ILaunchpadCelebrities, IPersonSet) |
236 | + >>> from canonical.launchpad.interfaces.launchpad import ( |
237 | + ... ILaunchpadCelebrities) |
238 | + >>> from lp.registry.interfaces.person import IPersonSet |
239 | >>> from lp.translations.interfaces.translationimportqueue import ( |
240 | ... ITranslationImportQueue) |
241 | >>> from lp.translations.model.potemplate import POTemplateSubset |
242 | |
243 | === modified file 'lib/lp/translations/doc/poimport.txt' |
244 | --- lib/lp/translations/doc/poimport.txt 2010-07-13 15:02:20 +0000 |
245 | +++ lib/lp/translations/doc/poimport.txt 2010-10-04 09:44:48 +0000 |
246 | @@ -9,8 +9,11 @@ |
247 | Here are some imports we need to get this test running. |
248 | |
249 | >>> from canonical.launchpad.ftests import syncUpdate |
250 | - >>> from canonical.launchpad.interfaces import ( |
251 | - ... ILanguageSet, ILaunchpadCelebrities, IPersonSet, IProductSet) |
252 | + >>> from canonical.launchpad.interfaces.launchpad import ( |
253 | + ... ILaunchpadCelebrities) |
254 | + >>> from lp.registry.interfaces.person import IPersonSet |
255 | + >>> from lp.registry.interfaces.product import IProductSet |
256 | + >>> from lp.services.worlddata.interfaces.language import ILanguageSet |
257 | >>> from lp.translations.interfaces.translationimportqueue import ( |
258 | ... ITranslationImportQueue, RosettaImportStatus) |
259 | >>> from lp.registry.model.sourcepackagename import SourcePackageName |
260 | |
261 | === modified file 'lib/lp/translations/doc/potmsgset.txt' |
262 | --- lib/lp/translations/doc/potmsgset.txt 2010-09-07 15:26:49 +0000 |
263 | +++ lib/lp/translations/doc/potmsgset.txt 2010-10-04 09:44:48 +0000 |
264 | @@ -14,8 +14,9 @@ |
265 | >>> from lp.translations.model.translationmessage import ( |
266 | ... TranslationMessage) |
267 | >>> from lp.translations.interfaces.potmsgset import IPOTMsgSet |
268 | - >>> from canonical.launchpad.interfaces import ( |
269 | - ... ILanguageSet, IPersonSet, IProductSet) |
270 | + >>> from lp.registry.interfaces.person import IPersonSet |
271 | + >>> from lp.registry.interfaces.product import IProductSet |
272 | + >>> from lp.services.worlddata.interfaces.language import ILanguageSet |
273 | |
274 | >>> potemplate = factory.makePOTemplate() |
275 | >>> potmsgset = factory.makePOTMsgSet( |
276 | @@ -657,8 +658,7 @@ |
277 | translation for exactly the same English string, but in a different |
278 | translation template. |
279 | |
280 | - >>> from canonical.launchpad.interfaces import ( |
281 | - ... IDistributionSet, IProductSet) |
282 | + >>> from lp.registry.interfaces.distribution import IDistributionSet |
283 | >>> from lp.translations.interfaces.potemplate import IPOTemplateSet |
284 | |
285 | Suggestions between modules depend also on whether the other translation |
286 | |
287 | === modified file 'lib/lp/translations/doc/request_country.txt' |
288 | --- lib/lp/translations/doc/request_country.txt 2009-10-22 11:55:51 +0000 |
289 | +++ lib/lp/translations/doc/request_country.txt 2010-10-04 09:44:48 +0000 |
290 | @@ -21,7 +21,7 @@ |
291 | |
292 | Here's us converting it to a country. |
293 | |
294 | - >>> from canonical.launchpad.interfaces import ICountry |
295 | + >>> from lp.services.worlddata.interfaces.country import ICountry |
296 | >>> country = ICountry(request) |
297 | >>> country.name |
298 | u'United Kingdom' |
299 | |
300 | === modified file 'lib/lp/translations/doc/rosetta-karma.txt' |
301 | --- lib/lp/translations/doc/rosetta-karma.txt 2010-07-16 16:51:52 +0000 |
302 | +++ lib/lp/translations/doc/rosetta-karma.txt 2010-10-04 09:44:48 +0000 |
303 | @@ -7,9 +7,10 @@ |
304 | like SQLObjects are not persistent between transactions. |
305 | |
306 | >>> import transaction |
307 | - >>> from canonical.launchpad.interfaces import ( |
308 | - ... IKarmaActionSet, IPersonSet, |
309 | + >>> from canonical.launchpad.interfaces.launchpad import ( |
310 | ... ILaunchpadCelebrities) |
311 | + >>> from lp.registry.interfaces.karma import IKarmaActionSet |
312 | + >>> from lp.registry.interfaces.person import IPersonSet |
313 | >>> from lp.translations.interfaces.translationimportqueue import ( |
314 | ... ITranslationImportQueue, RosettaImportStatus) |
315 | >>> from lp.translations.model.potemplate import POTemplate |
316 | |
317 | === modified file 'lib/lp/translations/doc/rosetta-poimport-script.txt' |
318 | --- lib/lp/translations/doc/rosetta-poimport-script.txt 2010-04-01 04:29:46 +0000 |
319 | +++ lib/lp/translations/doc/rosetta-poimport-script.txt 2010-10-04 09:44:48 +0000 |
320 | @@ -1,8 +1,9 @@ |
321 | = PO import script = |
322 | |
323 | >>> from lp.translations.model.potemplate import POTemplate |
324 | - >>> from canonical.launchpad.interfaces import ( |
325 | - ... ILaunchpadCelebrities, IPersonSet) |
326 | + >>> from canonical.launchpad.interfaces.launchpad import ( |
327 | + ... ILaunchpadCelebrities) |
328 | + >>> from lp.registry.interfaces.person import IPersonSet |
329 | >>> from lp.translations.interfaces.translationimportqueue import ( |
330 | ... ITranslationImportQueue, |
331 | ... RosettaImportStatus) |
332 | |
333 | === modified file 'lib/lp/translations/doc/sourcepackagerelease-translations.txt' |
334 | --- lib/lp/translations/doc/sourcepackagerelease-translations.txt 2010-07-23 11:18:54 +0000 |
335 | +++ lib/lp/translations/doc/sourcepackagerelease-translations.txt 2010-10-04 09:44:48 +0000 |
336 | @@ -44,7 +44,8 @@ |
337 | |
338 | And the 'katie' celebrity as the user responsible for the transalation. |
339 | |
340 | - >>> from canonical.launchpad.interfaces import ILaunchpadCelebrities |
341 | + >>> from canonical.launchpad.interfaces.launchpad import ( |
342 | + ... ILaunchpadCelebrities) |
343 | >>> katie = getUtility(ILaunchpadCelebrities).katie |
344 | |
345 | Before the final upload, we can see that the translation queue for the |
346 | |
347 | === modified file 'lib/lp/translations/doc/translationgroup.txt' |
348 | --- lib/lp/translations/doc/translationgroup.txt 2010-09-03 06:37:26 +0000 |
349 | +++ lib/lp/translations/doc/translationgroup.txt 2010-10-04 09:44:48 +0000 |
350 | @@ -12,16 +12,16 @@ |
351 | ... ITranslationGroupSet) |
352 | >>> translation_group_set = getUtility(ITranslationGroupSet) |
353 | |
354 | - >>> from canonical.launchpad.interfaces import IPersonSet |
355 | + >>> from lp.registry.interfaces.person import IPersonSet |
356 | >>> person_set = getUtility(IPersonSet) |
357 | |
358 | - >>> from canonical.launchpad.interfaces import IProductSet |
359 | + >>> from lp.registry.interfaces.product import IProductSet |
360 | >>> product_set = getUtility(IProductSet) |
361 | |
362 | >>> from lp.translations.interfaces.translator import ITranslatorSet |
363 | >>> translator_set = getUtility(ITranslatorSet) |
364 | |
365 | - >>> from canonical.launchpad.interfaces import ILanguageSet |
366 | + >>> from lp.services.worlddata.interfaces.language import ILanguageSet |
367 | >>> language_set = getUtility(ILanguageSet) |
368 | |
369 | >>> from lp.translations.interfaces.potemplate import IPOTemplateSet |
370 | |
371 | === modified file 'lib/lp/translations/doc/translationimportqueue.txt' |
372 | --- lib/lp/translations/doc/translationimportqueue.txt 2010-08-31 23:03:45 +0000 |
373 | +++ lib/lp/translations/doc/translationimportqueue.txt 2010-10-04 09:44:48 +0000 |
374 | @@ -27,9 +27,13 @@ |
375 | >>> import transaction |
376 | >>> from zope.component import getUtility |
377 | >>> from canonical.database.sqlbase import flush_database_updates |
378 | - >>> from canonical.launchpad.interfaces import ( |
379 | - ... IDistributionSet, IDistroSeries, ILaunchpadCelebrities, |
380 | - ... IProductSet, ISourcePackageNameSet) |
381 | + >>> from canonical.launchpad.interfaces.launchpad import ( |
382 | + ... ILaunchpadCelebrities) |
383 | + >>> from lp.registry.interfaces.distribution import IDistributionSet |
384 | + >>> from lp.registry.interfaces.distroseries import IDistroSeries |
385 | + >>> from lp.registry.interfaces.product import IProductSet |
386 | + >>> from lp.registry.interfaces.sourcepackagename import ( |
387 | + ... ISourcePackageNameSet) |
388 | >>> from lp.translations.interfaces.translationimportqueue import ( |
389 | ... ITranslationImportQueue, RosettaImportStatus) |
390 | >>> from lp.registry.model.distroseries import DistroSeries |
391 | @@ -256,7 +260,8 @@ |
392 | kdebase, kde-i18n-es and kde-l10n-sr-latin. The first is from where the .pot |
393 | file come and the others have .po files. |
394 | |
395 | - >>> from canonical.launchpad.interfaces import ISourcePackageNameSet |
396 | + >>> from lp.registry.interfaces.sourcepackagename import ( |
397 | + ... ISourcePackageNameSet) |
398 | >>> sourcepackagenameset = getUtility(ISourcePackageNameSet) |
399 | >>> kdebase = sourcepackagenameset.new('kdebase') |
400 | >>> kde_i18n_es = sourcepackagenameset.new('kde-i18n-es') |
401 | |
402 | === modified file 'lib/lp/translations/doc/translationmessage.txt' |
403 | --- lib/lp/translations/doc/translationmessage.txt 2009-07-02 17:16:50 +0000 |
404 | +++ lib/lp/translations/doc/translationmessage.txt 2010-10-04 09:44:48 +0000 |
405 | @@ -4,8 +4,8 @@ |
406 | |
407 | >>> from zope.component import getUtility |
408 | >>> from canonical.launchpad.webapp.testing import verifyObject |
409 | - >>> from canonical.launchpad.interfaces import ( |
410 | - ... ILanguageSet, IPersonSet) |
411 | + >>> from lp.registry.interfaces.person import IPersonSet |
412 | + >>> from lp.services.worlddata.interfaces.language import ILanguageSet |
413 | >>> from lp.translations.interfaces.translationmessage import ( |
414 | ... ITranslationMessage) |
415 | >>> from lp.translations.interfaces.translator import ITranslatorSet |
416 | |
417 | === modified file 'lib/lp/translations/doc/translationsoverview.txt' |
418 | --- lib/lp/translations/doc/translationsoverview.txt 2010-08-31 23:03:45 +0000 |
419 | +++ lib/lp/translations/doc/translationsoverview.txt 2010-10-04 09:44:48 +0000 |
420 | @@ -15,9 +15,10 @@ |
421 | >>> from zope.component import getUtility |
422 | >>> from lp.registry.model.karma import KarmaCategory |
423 | >>> from lp.registry.model.sourcepackagename import SourcePackageName |
424 | - >>> from canonical.launchpad.interfaces import ( |
425 | - ... IDistributionSet, IKarmaCacheManager, IPersonSet, |
426 | - ... IProductSet) |
427 | + >>> from lp.registry.interfaces.distribution import IDistributionSet |
428 | + >>> from lp.registry.interfaces.karma import IKarmaCacheManager |
429 | + >>> from lp.registry.interfaces.person import IPersonSet |
430 | + >>> from lp.registry.interfaces.product import IProductSet |
431 | >>> from lp.translations.interfaces.translationsoverview import ( |
432 | ... ITranslationsOverview) |
433 | >>> from canonical.testing import LaunchpadZopelessLayer |
434 | |
435 | === modified file 'lib/lp/translations/doc/translationsperson.txt' |
436 | --- lib/lp/translations/doc/translationsperson.txt 2010-09-02 11:33:28 +0000 |
437 | +++ lib/lp/translations/doc/translationsperson.txt 2010-10-04 09:44:48 +0000 |
438 | @@ -4,7 +4,7 @@ |
439 | object which provides translatable languages and translation history. |
440 | |
441 | >>> from zope.component import getUtility |
442 | - >>> from canonical.launchpad.interfaces import IPersonSet |
443 | + >>> from lp.registry.interfaces.person import IPersonSet |
444 | >>> personset = getUtility(IPersonSet) |
445 | >>> from lp.translations.interfaces.translationsperson import ( |
446 | ... ITranslationsPerson) |
447 | |
448 | === modified file 'lib/lp/translations/doc/translationtemplatesbuildbehavior.txt' |
449 | --- lib/lp/translations/doc/translationtemplatesbuildbehavior.txt 2010-09-28 11:05:14 +0000 |
450 | +++ lib/lp/translations/doc/translationtemplatesbuildbehavior.txt 2010-10-04 09:44:48 +0000 |
451 | @@ -23,8 +23,10 @@ |
452 | |
453 | >>> from canonical.librarian.interfaces import ILibrarianClient |
454 | >>> from StringIO import StringIO |
455 | - >>> from canonical.launchpad.interfaces import ILibraryFileAliasSet |
456 | - >>> from canonical.launchpad.interfaces import ILaunchpadCelebrities |
457 | + >>> from canonical.launchpad.interfaces.librarian import ( |
458 | + ... ILibraryFileAliasSet) |
459 | + >>> from canonical.launchpad.interfaces.launchpad import ( |
460 | + ... ILaunchpadCelebrities) |
461 | |
462 | Choose an arbitrary file as the chroot tarball for the build slave. It |
463 | won't actually build, so it doesn't matter what's in there. |
464 | |
465 | === modified file 'lib/lp/translations/doc/vpoexport.txt' |
466 | --- lib/lp/translations/doc/vpoexport.txt 2010-07-14 06:36:24 +0000 |
467 | +++ lib/lp/translations/doc/vpoexport.txt 2010-10-04 09:44:48 +0000 |
468 | @@ -4,7 +4,7 @@ |
469 | exports in a more efficient way than fetching the entire objects. |
470 | |
471 | >>> from zope.component import getUtility |
472 | - >>> from canonical.launchpad.interfaces import IDistributionSet |
473 | + >>> from lp.registry.interfaces.distribution import IDistributionSet |
474 | >>> from lp.translations.interfaces.vpoexport import IVPOExportSet |
475 | |
476 | >>> vpoexportset = getUtility(IVPOExportSet) |
477 | |
478 | === modified file 'lib/lp/translations/model/translationtemplatesbuildbehavior.py' |
479 | --- lib/lp/translations/model/translationtemplatesbuildbehavior.py 2010-08-20 20:31:18 +0000 |
480 | +++ lib/lp/translations/model/translationtemplatesbuildbehavior.py 2010-10-04 09:44:48 +0000 |
481 | @@ -15,7 +15,7 @@ |
482 | from zope.interface import implements |
483 | from zope.security.proxy import removeSecurityProxy |
484 | |
485 | -from canonical.launchpad.interfaces import ILaunchpadCelebrities |
486 | +from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities |
487 | from lp.buildmaster.interfaces.buildfarmjobbehavior import ( |
488 | IBuildFarmJobBehavior, |
489 | ) |
490 | |
491 | === modified file 'lib/lp/translations/model/translationtemplatesbuildjob.py' |
492 | --- lib/lp/translations/model/translationtemplatesbuildjob.py 2010-08-27 15:03:18 +0000 |
493 | +++ lib/lp/translations/model/translationtemplatesbuildjob.py 2010-10-04 09:44:48 +0000 |
494 | @@ -18,7 +18,7 @@ |
495 | from zope.security.proxy import removeSecurityProxy |
496 | |
497 | from canonical.config import config |
498 | -from canonical.launchpad.interfaces import ILaunchpadCelebrities |
499 | +from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities |
500 | from canonical.launchpad.interfaces.lpstorm import ( |
501 | IMasterStore, |
502 | IStore, |
503 | |
504 | === modified file 'lib/lp/translations/stories/productseries/xx-productseries-translations.txt' |
505 | --- lib/lp/translations/stories/productseries/xx-productseries-translations.txt 2010-09-27 21:46:10 +0000 |
506 | +++ lib/lp/translations/stories/productseries/xx-productseries-translations.txt 2010-10-04 09:44:48 +0000 |
507 | @@ -195,9 +195,11 @@ |
508 | notice but not the link to the project's settings. |
509 | |
510 | >>> from zope.component import getUtility |
511 | - >>> from canonical.launchpad.interfaces import ( |
512 | - ... ILaunchpadCelebrities, IPersonSet, ITeamMembershipSet, |
513 | - ... TeamMembershipStatus) |
514 | + >>> from canonical.launchpad.interfaces.launchpad import ( |
515 | + ... ILaunchpadCelebrities) |
516 | + >>> from lp.registry.interfaces.person import IPersonSet |
517 | + >>> from lp.registry.interfaces.teammembership import ( |
518 | + ... ITeamMembershipSet, TeamMembershipStatus) |
519 | |
520 | # Log in so as to be able to create objects |
521 | >>> admin_email = 'foo.bar@canonical.com' |
522 | |
523 | === modified file 'lib/lp/translations/stories/standalone/xx-pofile-translate-message-filtering.txt' |
524 | --- lib/lp/translations/stories/standalone/xx-pofile-translate-message-filtering.txt 2009-11-09 17:08:21 +0000 |
525 | +++ lib/lp/translations/stories/standalone/xx-pofile-translate-message-filtering.txt 2010-10-04 09:44:48 +0000 |
526 | @@ -163,8 +163,9 @@ |
527 | |
528 | >>> from zope.component import getUtility |
529 | >>> from canonical.launchpad.ftests import login, logout |
530 | - >>> from canonical.launchpad.interfaces import ( |
531 | - ... ILanguageSet, IPersonSet, IProductSet) |
532 | + >>> from lp.registry.interfaces.person import IPersonSet |
533 | + >>> from lp.registry.interfaces.product import IProductSet |
534 | + >>> from lp.services.worlddata.interfaces.language import ILanguageSet |
535 | >>> from lp.translations.interfaces.translator import ITranslatorSet |
536 | |
537 | # Evolution uses Restricted mode, so a translation without reviewer |
538 | |
539 | === modified file 'lib/lp/translations/stories/standalone/xx-serieslanguage-index.txt' |
540 | --- lib/lp/translations/stories/standalone/xx-serieslanguage-index.txt 2010-09-28 00:07:37 +0000 |
541 | +++ lib/lp/translations/stories/standalone/xx-serieslanguage-index.txt 2010-10-04 09:44:48 +0000 |
542 | @@ -52,7 +52,8 @@ |
543 | This is done to so see what the page will look like when they exist. |
544 | |
545 | >>> from zope.component import getUtility |
546 | - >>> from canonical.launchpad.interfaces import ILaunchpadCelebrities |
547 | + >>> from canonical.launchpad.interfaces.launchpad import ( |
548 | + ... ILaunchpadCelebrities) |
549 | >>> from lp.translations.interfaces.translationgroup import ( |
550 | ... TranslationPermission) |
551 | >>> login('foo.bar@canonical.com') |
552 | |
553 | === modified file 'lib/lp/translations/stories/standalone/xx-sourcepackage-export.txt' |
554 | --- lib/lp/translations/stories/standalone/xx-sourcepackage-export.txt 2009-12-24 01:41:54 +0000 |
555 | +++ lib/lp/translations/stories/standalone/xx-sourcepackage-export.txt 2010-10-04 09:44:48 +0000 |
556 | @@ -85,8 +85,11 @@ |
557 | >>> from zope.component import getUtility |
558 | |
559 | >>> from canonical.launchpad.ftests import login, logout |
560 | - >>> from canonical.launchpad.interfaces import ( |
561 | - ... IDistributionSet, ILaunchpadCelebrities, IPersonSet) |
562 | + >>> from canonical.launchpad.interfaces.launchpad import ( |
563 | + ... ILaunchpadCelebrities) |
564 | + >>> from lp.registry.interfaces.distribution import IDistributionSet |
565 | + >>> from lp.registry.interfaces.person import IPersonSet |
566 | + |
567 | |
568 | >>> # Log in so we can use utilities and the LaunchpadObjectFactory. |
569 | >>> login('foo.bar@canonical.com') |
570 | |
571 | === modified file 'lib/lp/translations/stories/standalone/xx-translationmessage-translate.txt' |
572 | --- lib/lp/translations/stories/standalone/xx-translationmessage-translate.txt 2010-04-29 12:38:47 +0000 |
573 | +++ lib/lp/translations/stories/standalone/xx-translationmessage-translate.txt 2010-10-04 09:44:48 +0000 |
574 | @@ -501,8 +501,10 @@ |
575 | |
576 | >>> from zope.component import getUtility |
577 | >>> from canonical.launchpad.ftests import login, logout |
578 | - >>> from canonical.launchpad.interfaces import ( |
579 | - ... IDistributionSet, IPersonSet, ISourcePackageNameSet) |
580 | + >>> from lp.registry.interfaces.distribution import IDistributionSet |
581 | + >>> from lp.registry.interfaces.person import IPersonSet |
582 | + >>> from lp.registry.interfaces.sourcepackagename import ( |
583 | + ... ISourcePackageNameSet) |
584 | >>> from lp.translations.interfaces.potemplate import IPOTemplateSet |
585 | >>> login("carlos@canonical.com") |
586 | >>> carlos = getUtility(IPersonSet).getByName('carlos') |
587 | |
588 | === modified file 'lib/lp/translations/stories/translationgroups/60-translation-suggestions.txt' |
589 | --- lib/lp/translations/stories/translationgroups/60-translation-suggestions.txt 2009-07-16 11:45:22 +0000 |
590 | +++ lib/lp/translations/stories/translationgroups/60-translation-suggestions.txt 2010-10-04 09:44:48 +0000 |
591 | @@ -13,8 +13,9 @@ |
592 | |
593 | >>> from zope.component import getUtility |
594 | >>> from canonical.launchpad.ftests import login, logout |
595 | - >>> from canonical.launchpad.interfaces import ( |
596 | - ... ILanguageSet, IPersonSet, IDistributionSet) |
597 | + >>> from lp.registry.interfaces.distribution import IDistributionSet |
598 | + >>> from lp.registry.interfaces.person import IPersonSet |
599 | + >>> from lp.services.worlddata.interfaces.language import ILanguageSet |
600 | >>> from lp.translations.interfaces.translator import ITranslatorSet |
601 | |
602 | >>> login('foo.bar@canonical.com') |
603 | |
604 | === modified file 'lib/lp/translations/tests/potmsgset-update-translation.txt' |
605 | --- lib/lp/translations/tests/potmsgset-update-translation.txt 2010-03-13 02:27:53 +0000 |
606 | +++ lib/lp/translations/tests/potmsgset-update-translation.txt 2010-10-04 09:44:48 +0000 |
607 | @@ -4,7 +4,7 @@ |
608 | >>> from canonical.database.sqlbase import flush_database_updates |
609 | >>> from lp.translations.model.pomsgid import POMsgID |
610 | >>> from lp.translations.model.potemplate import POTemplate |
611 | - >>> from canonical.launchpad.interfaces import IPersonSet |
612 | + >>> from lp.registry.interfaces.person import IPersonSet |
613 | >>> UTC = pytz.timezone('UTC') |
614 | |
615 | Get the PO msgid we will be working with. |
616 | |
617 | === modified file 'lib/lp/translations/tests/test_translationtemplatesbuildbehavior.py' |
618 | --- lib/lp/translations/tests/test_translationtemplatesbuildbehavior.py 2010-08-27 11:19:54 +0000 |
619 | +++ lib/lp/translations/tests/test_translationtemplatesbuildbehavior.py 2010-10-04 09:44:48 +0000 |
620 | @@ -13,7 +13,7 @@ |
621 | from zope.security.proxy import removeSecurityProxy |
622 | |
623 | from canonical.config import config |
624 | -from canonical.launchpad.interfaces import ILaunchpadCelebrities |
625 | +from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities |
626 | from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet |
627 | from canonical.testing import LaunchpadZopelessLayer |
628 | from lp.buildmaster.enums import BuildStatus |
629 | |
630 | === modified file 'lib/lp/translations/tests/test_translationtemplatesbuildjob.py' |
631 | --- lib/lp/translations/tests/test_translationtemplatesbuildjob.py 2010-08-25 11:07:19 +0000 |
632 | +++ lib/lp/translations/tests/test_translationtemplatesbuildjob.py 2010-10-04 09:44:48 +0000 |
633 | @@ -10,7 +10,7 @@ |
634 | from zope.event import notify |
635 | from zope.security.proxy import removeSecurityProxy |
636 | |
637 | -from canonical.launchpad.interfaces import ILaunchpadCelebrities |
638 | +from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities |
639 | from canonical.launchpad.webapp.interfaces import ( |
640 | DEFAULT_FLAVOR, |
641 | IStoreSelector, |
Woohoo!