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:
|
|||
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 | 26 | 26 | ||
| 6 | 27 | from canonical.config import config | 27 | from canonical.config import config |
| 7 | 28 | from canonical.launchpad import _ | 28 | from canonical.launchpad import _ |
| 8 | 29 | from canonical.launchpad.interfaces import ILaunchBag | ||
| 9 | 30 | from canonical.launchpad.webapp import ( | 29 | from canonical.launchpad.webapp import ( |
| 10 | 31 | canonical_url, | 30 | canonical_url, |
| 11 | 32 | enabled_with_permission, | 31 | enabled_with_permission, |
| 12 | @@ -36,6 +35,7 @@ | |||
| 13 | 36 | NavigationMenu, | 35 | NavigationMenu, |
| 14 | 37 | ) | 36 | ) |
| 15 | 38 | from canonical.launchpad.webapp.batching import BatchNavigator | 37 | from canonical.launchpad.webapp.batching import BatchNavigator |
| 16 | 38 | from canonical.launchpad.webapp.interfaces import ILaunchBag | ||
| 17 | 39 | from canonical.launchpad.webapp.menu import structured | 39 | from canonical.launchpad.webapp.menu import structured |
| 18 | 40 | from canonical.lazr.utils import smartquote | 40 | from canonical.lazr.utils import smartquote |
| 19 | 41 | from lp.app.errors import ( | 41 | from lp.app.errors import ( |
| 20 | 42 | 42 | ||
| 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 | 4 | Let's use ubuntu/hoary for these tests. | 4 | Let's use ubuntu/hoary for these tests. |
| 26 | 5 | 5 | ||
| 27 | 6 | >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest | 6 | >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest |
| 29 | 7 | >>> from canonical.launchpad.interfaces import IDistributionSet | 7 | >>> from lp.registry.interfaces.distribution import IDistributionSet |
| 30 | 8 | >>> from lp.registry.interfaces.series import SeriesStatus | 8 | >>> from lp.registry.interfaces.series import SeriesStatus |
| 31 | 9 | >>> ubuntu = getUtility(IDistributionSet).getByName('ubuntu') | 9 | >>> ubuntu = getUtility(IDistributionSet).getByName('ubuntu') |
| 32 | 10 | >>> hoary = ubuntu.getSeries('hoary') | 10 | >>> hoary = ubuntu.getSeries('hoary') |
| 33 | @@ -25,8 +25,10 @@ | |||
| 34 | 25 | >>> from zope.security.proxy import removeSecurityProxy | 25 | >>> from zope.security.proxy import removeSecurityProxy |
| 35 | 26 | >>> from lp.translations.browser.distroseries import ( | 26 | >>> from lp.translations.browser.distroseries import ( |
| 36 | 27 | ... DistroSeriesView) | 27 | ... DistroSeriesView) |
| 39 | 28 | >>> from canonical.launchpad.interfaces import ( | 28 | >>> from canonical.launchpad.interfaces.launchpad import ( |
| 40 | 29 | ... ILaunchpadCelebrities, ITeamMembershipSet, TeamMembershipStatus) | 29 | ... ILaunchpadCelebrities) |
| 41 | 30 | >>> from lp.registry.interfaces.teammembership import ( | ||
| 42 | 31 | ... ITeamMembershipSet, TeamMembershipStatus) | ||
| 43 | 30 | >>> from lp.app.errors import TranslationUnavailable | 32 | >>> from lp.app.errors import TranslationUnavailable |
| 44 | 31 | 33 | ||
| 45 | 32 | >>> def check_translations_access(distroseries): | 34 | >>> def check_translations_access(distroseries): |
| 46 | 33 | 35 | ||
| 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 | 153 | 153 | ||
| 52 | 154 | The Ubuntu distribution gets special treatment for the language pack flag. | 154 | The Ubuntu distribution gets special treatment for the language pack flag. |
| 53 | 155 | 155 | ||
| 55 | 156 | >>> from canonical.launchpad.interfaces import ( | 156 | >>> from canonical.launchpad.interfaces.launchpad import ( |
| 56 | 157 | ... ILaunchpadCelebrities) | 157 | ... ILaunchpadCelebrities) |
| 57 | 158 | >>> ubuntu = getUtility(ILaunchpadCelebrities).ubuntu | 158 | >>> ubuntu = getUtility(ILaunchpadCelebrities).ubuntu |
| 58 | 159 | >>> ubuntuseries = factory.makeDistroRelease(ubuntu) | 159 | >>> ubuntuseries = factory.makeDistroRelease(ubuntu) |
| 59 | 160 | 160 | ||
| 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 | 11 | 11 | ||
| 65 | 12 | The Rosetta homepage. | 12 | The Rosetta homepage. |
| 66 | 13 | 13 | ||
| 68 | 14 | >>> from canonical.launchpad.interfaces import IRosettaApplication | 14 | >>> from canonical.launchpad.interfaces.launchpad import ( |
| 69 | 15 | ... IRosettaApplication) | ||
| 70 | 15 | >>> canonical_url(getUtility(IRosettaApplication)) | 16 | >>> canonical_url(getUtility(IRosettaApplication)) |
| 71 | 16 | u'http://launchpad.dev/translations' | 17 | u'http://launchpad.dev/translations' |
| 72 | 17 | 18 | ||
| 73 | @@ -29,7 +30,7 @@ | |||
| 74 | 29 | 30 | ||
| 75 | 30 | >>> from lp.registry.interfaces.sourcepackagename import ( | 31 | >>> from lp.registry.interfaces.sourcepackagename import ( |
| 76 | 31 | ... ISourcePackageNameSet) | 32 | ... ISourcePackageNameSet) |
| 78 | 32 | >>> from canonical.launchpad.interfaces import IDistributionSet | 33 | >>> from lp.registry.interfaces.distribution import IDistributionSet |
| 79 | 33 | >>> sourcepackagenameset = getUtility(ISourcePackageNameSet) | 34 | >>> sourcepackagenameset = getUtility(ISourcePackageNameSet) |
| 80 | 34 | >>> sourcepackagename = sourcepackagenameset['evolution'] | 35 | >>> sourcepackagename = sourcepackagenameset['evolution'] |
| 81 | 35 | >>> distroset = getUtility(IDistributionSet) | 36 | >>> distroset = getUtility(IDistributionSet) |
| 82 | @@ -81,7 +82,7 @@ | |||
| 83 | 81 | Now we can get an upstream subset and do the same sorts of thing as we did | 82 | Now we can get an upstream subset and do the same sorts of thing as we did |
| 84 | 82 | with the distro subset. | 83 | with the distro subset. |
| 85 | 83 | 84 | ||
| 87 | 84 | >>> from canonical.launchpad.interfaces import IProductSet | 85 | >>> from lp.registry.interfaces.product import IProductSet |
| 88 | 85 | >>> productset = getUtility(IProductSet) | 86 | >>> productset = getUtility(IProductSet) |
| 89 | 86 | >>> evolution_product = productset['evolution'] | 87 | >>> evolution_product = productset['evolution'] |
| 90 | 87 | >>> evolution_trunk_series = evolution_product.getSeries('trunk') | 88 | >>> evolution_trunk_series = evolution_product.getSeries('trunk') |
| 91 | 88 | 89 | ||
| 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 | 7 | will work with spanish in Hoary first. | 7 | will work with spanish in Hoary first. |
| 97 | 8 | 8 | ||
| 98 | 9 | >>> from zope.component import getUtility | 9 | >>> from zope.component import getUtility |
| 101 | 10 | >>> from canonical.launchpad.interfaces import ( | 10 | >>> from lp.registry.interfaces.distroseries import IDistroSeriesSet |
| 102 | 11 | ... IDistroSeriesSet, IDistributionSet, ILanguageSet) | 11 | >>> from lp.registry.interfaces.distribution import IDistributionSet |
| 103 | 12 | >>> from lp.services.worlddata.interfaces.language import ILanguageSet | ||
| 104 | 12 | >>> from lp.translations.interfaces.distroserieslanguage import ( | 13 | >>> from lp.translations.interfaces.distroserieslanguage import ( |
| 105 | 13 | ... IDistroSeriesLanguage) | 14 | ... IDistroSeriesLanguage) |
| 106 | 14 | >>> distroseriesset = getUtility(IDistroSeriesSet) | 15 | >>> distroseriesset = getUtility(IDistroSeriesSet) |
| 107 | 15 | 16 | ||
| 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 | 11 | >>> from cStringIO import StringIO | 11 | >>> from cStringIO import StringIO |
| 113 | 12 | >>> from zope.component import getUtility | 12 | >>> from zope.component import getUtility |
| 114 | 13 | >>> from zope.interface import providedBy | 13 | >>> from zope.interface import providedBy |
| 117 | 14 | >>> from canonical.launchpad.interfaces import ( | 14 | >>> from lp.registry.interfaces.distribution import IDistributionSet |
| 116 | 15 | ... IDistributionSet) | ||
| 118 | 16 | >>> from lp.translations.interfaces.languagepack import ( | 15 | >>> from lp.translations.interfaces.languagepack import ( |
| 119 | 17 | ... ILanguagePack, | 16 | ... ILanguagePack, |
| 120 | 18 | ... ILanguagePackSet, | 17 | ... ILanguagePackSet, |
| 121 | 19 | 18 | ||
| 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 | 12 | >>> import transaction | 12 | >>> import transaction |
| 127 | 13 | >>> from canonical.launchpad.ftests import login | 13 | >>> from canonical.launchpad.ftests import login |
| 128 | 14 | >>> from canonical.launchpad.helpers import string_to_tarfile | 14 | >>> from canonical.launchpad.helpers import string_to_tarfile |
| 130 | 15 | >>> from canonical.launchpad.interfaces import ILaunchpadCelebrities | 15 | >>> from canonical.launchpad.interfaces.launchpad import ( |
| 131 | 16 | ... ILaunchpadCelebrities) | ||
| 132 | 16 | >>> from lp.translations.scripts.language_pack import \ | 17 | >>> from lp.translations.scripts.language_pack import \ |
| 133 | 17 | ... export_language_pack | 18 | ... export_language_pack |
| 134 | 18 | >>> from canonical.librarian.interfaces import ILibrarianClient | 19 | >>> from canonical.librarian.interfaces import ILibrarianClient |
| 135 | 19 | 20 | ||
| 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 | 11 | 11 | ||
| 141 | 12 | >>> import transaction | 12 | >>> import transaction |
| 142 | 13 | >>> from zope.component import getUtility | 13 | >>> from zope.component import getUtility |
| 144 | 14 | >>> from canonical.launchpad.interfaces import IPersonSet | 14 | >>> from lp.registry.interfaces.person import IPersonSet |
| 145 | 15 | >>> from lp.testing.faketransaction import FakeTransaction | 15 | >>> from lp.testing.faketransaction import FakeTransaction |
| 146 | 16 | >>> from lp.testing.mail_helpers import pop_notifications, print_emails | 16 | >>> from lp.testing.mail_helpers import pop_notifications, print_emails |
| 147 | 17 | >>> from lp.translations.scripts.po_export_queue import ExportResult | 17 | >>> from lp.translations.scripts.po_export_queue import ExportResult |
| 148 | 18 | 18 | ||
| 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 | 6 | >>> import pytz | 6 | >>> import pytz |
| 154 | 7 | >>> from zope.component import getUtility | 7 | >>> from zope.component import getUtility |
| 155 | 8 | >>> from canonical.launchpad.webapp.testing import verifyObject | 8 | >>> from canonical.launchpad.webapp.testing import verifyObject |
| 158 | 9 | >>> from canonical.launchpad.interfaces import ( | 9 | >>> from lp.registry.interfaces.distribution import IDistributionSet |
| 159 | 10 | ... IDistributionSet, ILanguageSet, IPersonSet, | 10 | >>> from lp.registry.interfaces.person import IPersonSet |
| 160 | 11 | >>> from lp.registry.interfaces.sourcepackagename import ( | ||
| 161 | 11 | ... ISourcePackageNameSet) | 12 | ... ISourcePackageNameSet) |
| 162 | 13 | >>> from lp.services.worlddata.interfaces.language import ILanguageSet | ||
| 163 | 12 | >>> from lp.translations.interfaces.pofile import IPOFile | 14 | >>> from lp.translations.interfaces.pofile import IPOFile |
| 164 | 13 | >>> from lp.translations.interfaces.potemplate import IPOTemplateSet | 15 | >>> from lp.translations.interfaces.potemplate import IPOTemplateSet |
| 165 | 14 | >>> sourcepackagenameset = getUtility(ISourcePackageNameSet) | 16 | >>> sourcepackagenameset = getUtility(ISourcePackageNameSet) |
| 166 | @@ -367,8 +369,9 @@ | |||
| 167 | 367 | 369 | ||
| 168 | 368 | Do some needed imports. | 370 | Do some needed imports. |
| 169 | 369 | 371 | ||
| 172 | 370 | >>> from canonical.launchpad.interfaces import ILaunchpadCelebrities | 372 | >>> from canonical.launchpad.interfaces.launchpad import ( |
| 173 | 371 | >>> from canonical.launchpad.interfaces import IProductSet | 373 | ... ILaunchpadCelebrities) |
| 174 | 374 | >>> from lp.registry.interfaces.product import IProductSet | ||
| 175 | 372 | >>> from lp.translations.interfaces.translationgroup import ( | 375 | >>> from lp.translations.interfaces.translationgroup import ( |
| 176 | 373 | ... ITranslationGroupSet, TranslationPermission) | 376 | ... ITranslationGroupSet, TranslationPermission) |
| 177 | 374 | >>> from lp.translations.model.pofile import POFile | 377 | >>> from lp.translations.model.pofile import POFile |
| 178 | 375 | 378 | ||
| 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 | 19 | 19 | ||
| 184 | 20 | Here are some imports we need to get this test running. | 20 | Here are some imports we need to get this test running. |
| 185 | 21 | 21 | ||
| 188 | 22 | >>> from canonical.launchpad.interfaces import ( | 22 | >>> from canonical.launchpad.interfaces.launchpad import ( |
| 189 | 23 | ... ILaunchpadCelebrities, IPersonSet) | 23 | ... ILaunchpadCelebrities) |
| 190 | 24 | >>> from lp.registry.interfaces.person import IPersonSet | ||
| 191 | 24 | >>> from lp.translations.interfaces.translationimportqueue import ( | 25 | >>> from lp.translations.interfaces.translationimportqueue import ( |
| 192 | 25 | ... ITranslationImportQueue, RosettaImportStatus) | 26 | ... ITranslationImportQueue, RosettaImportStatus) |
| 193 | 26 | >>> from lp.translations.model.potemplate import POTemplateSubset | 27 | >>> from lp.translations.model.potemplate import POTemplateSubset |
| 194 | 27 | 28 | ||
| 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 | 16 | 16 | ||
| 200 | 17 | Here are some imports we need to get this test running. | 17 | Here are some imports we need to get this test running. |
| 201 | 18 | 18 | ||
| 204 | 19 | >>> from canonical.launchpad.interfaces import ( | 19 | >>> from canonical.launchpad.interfaces.launchpad import ( |
| 205 | 20 | ... ILaunchpadCelebrities, IPersonSet) | 20 | ... ILaunchpadCelebrities) |
| 206 | 21 | >>> from lp.registry.interfaces.person import IPersonSet | ||
| 207 | 21 | >>> from lp.translations.interfaces.translationimportqueue import ( | 22 | >>> from lp.translations.interfaces.translationimportqueue import ( |
| 208 | 22 | ... ITranslationImportQueue) | 23 | ... ITranslationImportQueue) |
| 209 | 23 | >>> from lp.translations.model.potemplate import POTemplateSubset | 24 | >>> from lp.translations.model.potemplate import POTemplateSubset |
| 210 | 24 | 25 | ||
| 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 | 7 | 7 | ||
| 216 | 8 | Here are some imports we need to get this test running. | 8 | Here are some imports we need to get this test running. |
| 217 | 9 | 9 | ||
| 220 | 10 | >>> from canonical.launchpad.interfaces import ( | 10 | >>> from canonical.launchpad.interfaces.launchpad import ( |
| 221 | 11 | ... ILaunchpadCelebrities, IPersonSet) | 11 | ... ILaunchpadCelebrities) |
| 222 | 12 | >>> from lp.registry.interfaces.person import IPersonSet | ||
| 223 | 12 | >>> from lp.translations.interfaces.translationimportqueue import ( | 13 | >>> from lp.translations.interfaces.translationimportqueue import ( |
| 224 | 13 | ... ITranslationImportQueue) | 14 | ... ITranslationImportQueue) |
| 225 | 14 | >>> from lp.translations.model.potemplate import POTemplateSubset | 15 | >>> from lp.translations.model.potemplate import POTemplateSubset |
| 226 | 15 | 16 | ||
| 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 | 7 | 7 | ||
| 232 | 8 | Here are some imports we need to get this test running. | 8 | Here are some imports we need to get this test running. |
| 233 | 9 | 9 | ||
| 236 | 10 | >>> from canonical.launchpad.interfaces import ( | 10 | >>> from canonical.launchpad.interfaces.launchpad import ( |
| 237 | 11 | ... ILaunchpadCelebrities, IPersonSet) | 11 | ... ILaunchpadCelebrities) |
| 238 | 12 | >>> from lp.registry.interfaces.person import IPersonSet | ||
| 239 | 12 | >>> from lp.translations.interfaces.translationimportqueue import ( | 13 | >>> from lp.translations.interfaces.translationimportqueue import ( |
| 240 | 13 | ... ITranslationImportQueue) | 14 | ... ITranslationImportQueue) |
| 241 | 14 | >>> from lp.translations.model.potemplate import POTemplateSubset | 15 | >>> from lp.translations.model.potemplate import POTemplateSubset |
| 242 | 15 | 16 | ||
| 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 | 9 | Here are some imports we need to get this test running. | 9 | Here are some imports we need to get this test running. |
| 248 | 10 | 10 | ||
| 249 | 11 | >>> from canonical.launchpad.ftests import syncUpdate | 11 | >>> from canonical.launchpad.ftests import syncUpdate |
| 252 | 12 | >>> from canonical.launchpad.interfaces import ( | 12 | >>> from canonical.launchpad.interfaces.launchpad import ( |
| 253 | 13 | ... ILanguageSet, ILaunchpadCelebrities, IPersonSet, IProductSet) | 13 | ... ILaunchpadCelebrities) |
| 254 | 14 | >>> from lp.registry.interfaces.person import IPersonSet | ||
| 255 | 15 | >>> from lp.registry.interfaces.product import IProductSet | ||
| 256 | 16 | >>> from lp.services.worlddata.interfaces.language import ILanguageSet | ||
| 257 | 14 | >>> from lp.translations.interfaces.translationimportqueue import ( | 17 | >>> from lp.translations.interfaces.translationimportqueue import ( |
| 258 | 15 | ... ITranslationImportQueue, RosettaImportStatus) | 18 | ... ITranslationImportQueue, RosettaImportStatus) |
| 259 | 16 | >>> from lp.registry.model.sourcepackagename import SourcePackageName | 19 | >>> from lp.registry.model.sourcepackagename import SourcePackageName |
| 260 | 17 | 20 | ||
| 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 | 14 | >>> from lp.translations.model.translationmessage import ( | 14 | >>> from lp.translations.model.translationmessage import ( |
| 266 | 15 | ... TranslationMessage) | 15 | ... TranslationMessage) |
| 267 | 16 | >>> from lp.translations.interfaces.potmsgset import IPOTMsgSet | 16 | >>> from lp.translations.interfaces.potmsgset import IPOTMsgSet |
| 270 | 17 | >>> from canonical.launchpad.interfaces import ( | 17 | >>> from lp.registry.interfaces.person import IPersonSet |
| 271 | 18 | ... ILanguageSet, IPersonSet, IProductSet) | 18 | >>> from lp.registry.interfaces.product import IProductSet |
| 272 | 19 | >>> from lp.services.worlddata.interfaces.language import ILanguageSet | ||
| 273 | 19 | 20 | ||
| 274 | 20 | >>> potemplate = factory.makePOTemplate() | 21 | >>> potemplate = factory.makePOTemplate() |
| 275 | 21 | >>> potmsgset = factory.makePOTMsgSet( | 22 | >>> potmsgset = factory.makePOTMsgSet( |
| 276 | @@ -657,8 +658,7 @@ | |||
| 277 | 657 | translation for exactly the same English string, but in a different | 658 | translation for exactly the same English string, but in a different |
| 278 | 658 | translation template. | 659 | translation template. |
| 279 | 659 | 660 | ||
| 282 | 660 | >>> from canonical.launchpad.interfaces import ( | 661 | >>> from lp.registry.interfaces.distribution import IDistributionSet |
| 281 | 661 | ... IDistributionSet, IProductSet) | ||
| 283 | 662 | >>> from lp.translations.interfaces.potemplate import IPOTemplateSet | 662 | >>> from lp.translations.interfaces.potemplate import IPOTemplateSet |
| 284 | 663 | 663 | ||
| 285 | 664 | Suggestions between modules depend also on whether the other translation | 664 | Suggestions between modules depend also on whether the other translation |
| 286 | 665 | 665 | ||
| 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 | 21 | 21 | ||
| 292 | 22 | Here's us converting it to a country. | 22 | Here's us converting it to a country. |
| 293 | 23 | 23 | ||
| 295 | 24 | >>> from canonical.launchpad.interfaces import ICountry | 24 | >>> from lp.services.worlddata.interfaces.country import ICountry |
| 296 | 25 | >>> country = ICountry(request) | 25 | >>> country = ICountry(request) |
| 297 | 26 | >>> country.name | 26 | >>> country.name |
| 298 | 27 | u'United Kingdom' | 27 | u'United Kingdom' |
| 299 | 28 | 28 | ||
| 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 | 7 | like SQLObjects are not persistent between transactions. | 7 | like SQLObjects are not persistent between transactions. |
| 305 | 8 | 8 | ||
| 306 | 9 | >>> import transaction | 9 | >>> import transaction |
| 309 | 10 | >>> from canonical.launchpad.interfaces import ( | 10 | >>> from canonical.launchpad.interfaces.launchpad import ( |
| 308 | 11 | ... IKarmaActionSet, IPersonSet, | ||
| 310 | 12 | ... ILaunchpadCelebrities) | 11 | ... ILaunchpadCelebrities) |
| 311 | 12 | >>> from lp.registry.interfaces.karma import IKarmaActionSet | ||
| 312 | 13 | >>> from lp.registry.interfaces.person import IPersonSet | ||
| 313 | 13 | >>> from lp.translations.interfaces.translationimportqueue import ( | 14 | >>> from lp.translations.interfaces.translationimportqueue import ( |
| 314 | 14 | ... ITranslationImportQueue, RosettaImportStatus) | 15 | ... ITranslationImportQueue, RosettaImportStatus) |
| 315 | 15 | >>> from lp.translations.model.potemplate import POTemplate | 16 | >>> from lp.translations.model.potemplate import POTemplate |
| 316 | 16 | 17 | ||
| 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 | 1 | = PO import script = | 1 | = PO import script = |
| 322 | 2 | 2 | ||
| 323 | 3 | >>> from lp.translations.model.potemplate import POTemplate | 3 | >>> from lp.translations.model.potemplate import POTemplate |
| 326 | 4 | >>> from canonical.launchpad.interfaces import ( | 4 | >>> from canonical.launchpad.interfaces.launchpad import ( |
| 327 | 5 | ... ILaunchpadCelebrities, IPersonSet) | 5 | ... ILaunchpadCelebrities) |
| 328 | 6 | >>> from lp.registry.interfaces.person import IPersonSet | ||
| 329 | 6 | >>> from lp.translations.interfaces.translationimportqueue import ( | 7 | >>> from lp.translations.interfaces.translationimportqueue import ( |
| 330 | 7 | ... ITranslationImportQueue, | 8 | ... ITranslationImportQueue, |
| 331 | 8 | ... RosettaImportStatus) | 9 | ... RosettaImportStatus) |
| 332 | 9 | 10 | ||
| 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 | 44 | 44 | ||
| 338 | 45 | And the 'katie' celebrity as the user responsible for the transalation. | 45 | And the 'katie' celebrity as the user responsible for the transalation. |
| 339 | 46 | 46 | ||
| 341 | 47 | >>> from canonical.launchpad.interfaces import ILaunchpadCelebrities | 47 | >>> from canonical.launchpad.interfaces.launchpad import ( |
| 342 | 48 | ... ILaunchpadCelebrities) | ||
| 343 | 48 | >>> katie = getUtility(ILaunchpadCelebrities).katie | 49 | >>> katie = getUtility(ILaunchpadCelebrities).katie |
| 344 | 49 | 50 | ||
| 345 | 50 | Before the final upload, we can see that the translation queue for the | 51 | Before the final upload, we can see that the translation queue for the |
| 346 | 51 | 52 | ||
| 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 | 12 | ... ITranslationGroupSet) | 12 | ... ITranslationGroupSet) |
| 352 | 13 | >>> translation_group_set = getUtility(ITranslationGroupSet) | 13 | >>> translation_group_set = getUtility(ITranslationGroupSet) |
| 353 | 14 | 14 | ||
| 355 | 15 | >>> from canonical.launchpad.interfaces import IPersonSet | 15 | >>> from lp.registry.interfaces.person import IPersonSet |
| 356 | 16 | >>> person_set = getUtility(IPersonSet) | 16 | >>> person_set = getUtility(IPersonSet) |
| 357 | 17 | 17 | ||
| 359 | 18 | >>> from canonical.launchpad.interfaces import IProductSet | 18 | >>> from lp.registry.interfaces.product import IProductSet |
| 360 | 19 | >>> product_set = getUtility(IProductSet) | 19 | >>> product_set = getUtility(IProductSet) |
| 361 | 20 | 20 | ||
| 362 | 21 | >>> from lp.translations.interfaces.translator import ITranslatorSet | 21 | >>> from lp.translations.interfaces.translator import ITranslatorSet |
| 363 | 22 | >>> translator_set = getUtility(ITranslatorSet) | 22 | >>> translator_set = getUtility(ITranslatorSet) |
| 364 | 23 | 23 | ||
| 366 | 24 | >>> from canonical.launchpad.interfaces import ILanguageSet | 24 | >>> from lp.services.worlddata.interfaces.language import ILanguageSet |
| 367 | 25 | >>> language_set = getUtility(ILanguageSet) | 25 | >>> language_set = getUtility(ILanguageSet) |
| 368 | 26 | 26 | ||
| 369 | 27 | >>> from lp.translations.interfaces.potemplate import IPOTemplateSet | 27 | >>> from lp.translations.interfaces.potemplate import IPOTemplateSet |
| 370 | 28 | 28 | ||
| 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 | 27 | >>> import transaction | 27 | >>> import transaction |
| 376 | 28 | >>> from zope.component import getUtility | 28 | >>> from zope.component import getUtility |
| 377 | 29 | >>> from canonical.database.sqlbase import flush_database_updates | 29 | >>> from canonical.database.sqlbase import flush_database_updates |
| 381 | 30 | >>> from canonical.launchpad.interfaces import ( | 30 | >>> from canonical.launchpad.interfaces.launchpad import ( |
| 382 | 31 | ... IDistributionSet, IDistroSeries, ILaunchpadCelebrities, | 31 | ... ILaunchpadCelebrities) |
| 383 | 32 | ... IProductSet, ISourcePackageNameSet) | 32 | >>> from lp.registry.interfaces.distribution import IDistributionSet |
| 384 | 33 | >>> from lp.registry.interfaces.distroseries import IDistroSeries | ||
| 385 | 34 | >>> from lp.registry.interfaces.product import IProductSet | ||
| 386 | 35 | >>> from lp.registry.interfaces.sourcepackagename import ( | ||
| 387 | 36 | ... ISourcePackageNameSet) | ||
| 388 | 33 | >>> from lp.translations.interfaces.translationimportqueue import ( | 37 | >>> from lp.translations.interfaces.translationimportqueue import ( |
| 389 | 34 | ... ITranslationImportQueue, RosettaImportStatus) | 38 | ... ITranslationImportQueue, RosettaImportStatus) |
| 390 | 35 | >>> from lp.registry.model.distroseries import DistroSeries | 39 | >>> from lp.registry.model.distroseries import DistroSeries |
| 391 | @@ -256,7 +260,8 @@ | |||
| 392 | 256 | kdebase, kde-i18n-es and kde-l10n-sr-latin. The first is from where the .pot | 260 | kdebase, kde-i18n-es and kde-l10n-sr-latin. The first is from where the .pot |
| 393 | 257 | file come and the others have .po files. | 261 | file come and the others have .po files. |
| 394 | 258 | 262 | ||
| 396 | 259 | >>> from canonical.launchpad.interfaces import ISourcePackageNameSet | 263 | >>> from lp.registry.interfaces.sourcepackagename import ( |
| 397 | 264 | ... ISourcePackageNameSet) | ||
| 398 | 260 | >>> sourcepackagenameset = getUtility(ISourcePackageNameSet) | 265 | >>> sourcepackagenameset = getUtility(ISourcePackageNameSet) |
| 399 | 261 | >>> kdebase = sourcepackagenameset.new('kdebase') | 266 | >>> kdebase = sourcepackagenameset.new('kdebase') |
| 400 | 262 | >>> kde_i18n_es = sourcepackagenameset.new('kde-i18n-es') | 267 | >>> kde_i18n_es = sourcepackagenameset.new('kde-i18n-es') |
| 401 | 263 | 268 | ||
| 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 | 4 | 4 | ||
| 407 | 5 | >>> from zope.component import getUtility | 5 | >>> from zope.component import getUtility |
| 408 | 6 | >>> from canonical.launchpad.webapp.testing import verifyObject | 6 | >>> from canonical.launchpad.webapp.testing import verifyObject |
| 411 | 7 | >>> from canonical.launchpad.interfaces import ( | 7 | >>> from lp.registry.interfaces.person import IPersonSet |
| 412 | 8 | ... ILanguageSet, IPersonSet) | 8 | >>> from lp.services.worlddata.interfaces.language import ILanguageSet |
| 413 | 9 | >>> from lp.translations.interfaces.translationmessage import ( | 9 | >>> from lp.translations.interfaces.translationmessage import ( |
| 414 | 10 | ... ITranslationMessage) | 10 | ... ITranslationMessage) |
| 415 | 11 | >>> from lp.translations.interfaces.translator import ITranslatorSet | 11 | >>> from lp.translations.interfaces.translator import ITranslatorSet |
| 416 | 12 | 12 | ||
| 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 | 15 | >>> from zope.component import getUtility | 15 | >>> from zope.component import getUtility |
| 422 | 16 | >>> from lp.registry.model.karma import KarmaCategory | 16 | >>> from lp.registry.model.karma import KarmaCategory |
| 423 | 17 | >>> from lp.registry.model.sourcepackagename import SourcePackageName | 17 | >>> from lp.registry.model.sourcepackagename import SourcePackageName |
| 427 | 18 | >>> from canonical.launchpad.interfaces import ( | 18 | >>> from lp.registry.interfaces.distribution import IDistributionSet |
| 428 | 19 | ... IDistributionSet, IKarmaCacheManager, IPersonSet, | 19 | >>> from lp.registry.interfaces.karma import IKarmaCacheManager |
| 429 | 20 | ... IProductSet) | 20 | >>> from lp.registry.interfaces.person import IPersonSet |
| 430 | 21 | >>> from lp.registry.interfaces.product import IProductSet | ||
| 431 | 21 | >>> from lp.translations.interfaces.translationsoverview import ( | 22 | >>> from lp.translations.interfaces.translationsoverview import ( |
| 432 | 22 | ... ITranslationsOverview) | 23 | ... ITranslationsOverview) |
| 433 | 23 | >>> from canonical.testing import LaunchpadZopelessLayer | 24 | >>> from canonical.testing import LaunchpadZopelessLayer |
| 434 | 24 | 25 | ||
| 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 | 4 | object which provides translatable languages and translation history. | 4 | object which provides translatable languages and translation history. |
| 440 | 5 | 5 | ||
| 441 | 6 | >>> from zope.component import getUtility | 6 | >>> from zope.component import getUtility |
| 443 | 7 | >>> from canonical.launchpad.interfaces import IPersonSet | 7 | >>> from lp.registry.interfaces.person import IPersonSet |
| 444 | 8 | >>> personset = getUtility(IPersonSet) | 8 | >>> personset = getUtility(IPersonSet) |
| 445 | 9 | >>> from lp.translations.interfaces.translationsperson import ( | 9 | >>> from lp.translations.interfaces.translationsperson import ( |
| 446 | 10 | ... ITranslationsPerson) | 10 | ... ITranslationsPerson) |
| 447 | 11 | 11 | ||
| 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 | 23 | 23 | ||
| 453 | 24 | >>> from canonical.librarian.interfaces import ILibrarianClient | 24 | >>> from canonical.librarian.interfaces import ILibrarianClient |
| 454 | 25 | >>> from StringIO import StringIO | 25 | >>> from StringIO import StringIO |
| 457 | 26 | >>> from canonical.launchpad.interfaces import ILibraryFileAliasSet | 26 | >>> from canonical.launchpad.interfaces.librarian import ( |
| 458 | 27 | >>> from canonical.launchpad.interfaces import ILaunchpadCelebrities | 27 | ... ILibraryFileAliasSet) |
| 459 | 28 | >>> from canonical.launchpad.interfaces.launchpad import ( | ||
| 460 | 29 | ... ILaunchpadCelebrities) | ||
| 461 | 28 | 30 | ||
| 462 | 29 | Choose an arbitrary file as the chroot tarball for the build slave. It | 31 | Choose an arbitrary file as the chroot tarball for the build slave. It |
| 463 | 30 | won't actually build, so it doesn't matter what's in there. | 32 | won't actually build, so it doesn't matter what's in there. |
| 464 | 31 | 33 | ||
| 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 | 4 | exports in a more efficient way than fetching the entire objects. | 4 | exports in a more efficient way than fetching the entire objects. |
| 470 | 5 | 5 | ||
| 471 | 6 | >>> from zope.component import getUtility | 6 | >>> from zope.component import getUtility |
| 473 | 7 | >>> from canonical.launchpad.interfaces import IDistributionSet | 7 | >>> from lp.registry.interfaces.distribution import IDistributionSet |
| 474 | 8 | >>> from lp.translations.interfaces.vpoexport import IVPOExportSet | 8 | >>> from lp.translations.interfaces.vpoexport import IVPOExportSet |
| 475 | 9 | 9 | ||
| 476 | 10 | >>> vpoexportset = getUtility(IVPOExportSet) | 10 | >>> vpoexportset = getUtility(IVPOExportSet) |
| 477 | 11 | 11 | ||
| 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 | 15 | from zope.interface import implements | 15 | from zope.interface import implements |
| 483 | 16 | from zope.security.proxy import removeSecurityProxy | 16 | from zope.security.proxy import removeSecurityProxy |
| 484 | 17 | 17 | ||
| 486 | 18 | from canonical.launchpad.interfaces import ILaunchpadCelebrities | 18 | from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities |
| 487 | 19 | from lp.buildmaster.interfaces.buildfarmjobbehavior import ( | 19 | from lp.buildmaster.interfaces.buildfarmjobbehavior import ( |
| 488 | 20 | IBuildFarmJobBehavior, | 20 | IBuildFarmJobBehavior, |
| 489 | 21 | ) | 21 | ) |
| 490 | 22 | 22 | ||
| 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 | 18 | from zope.security.proxy import removeSecurityProxy | 18 | from zope.security.proxy import removeSecurityProxy |
| 496 | 19 | 19 | ||
| 497 | 20 | from canonical.config import config | 20 | from canonical.config import config |
| 499 | 21 | from canonical.launchpad.interfaces import ILaunchpadCelebrities | 21 | from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities |
| 500 | 22 | from canonical.launchpad.interfaces.lpstorm import ( | 22 | from canonical.launchpad.interfaces.lpstorm import ( |
| 501 | 23 | IMasterStore, | 23 | IMasterStore, |
| 502 | 24 | IStore, | 24 | IStore, |
| 503 | 25 | 25 | ||
| 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 | 195 | notice but not the link to the project's settings. | 195 | notice but not the link to the project's settings. |
| 509 | 196 | 196 | ||
| 510 | 197 | >>> from zope.component import getUtility | 197 | >>> from zope.component import getUtility |
| 514 | 198 | >>> from canonical.launchpad.interfaces import ( | 198 | >>> from canonical.launchpad.interfaces.launchpad import ( |
| 515 | 199 | ... ILaunchpadCelebrities, IPersonSet, ITeamMembershipSet, | 199 | ... ILaunchpadCelebrities) |
| 516 | 200 | ... TeamMembershipStatus) | 200 | >>> from lp.registry.interfaces.person import IPersonSet |
| 517 | 201 | >>> from lp.registry.interfaces.teammembership import ( | ||
| 518 | 202 | ... ITeamMembershipSet, TeamMembershipStatus) | ||
| 519 | 201 | 203 | ||
| 520 | 202 | # Log in so as to be able to create objects | 204 | # Log in so as to be able to create objects |
| 521 | 203 | >>> admin_email = 'foo.bar@canonical.com' | 205 | >>> admin_email = 'foo.bar@canonical.com' |
| 522 | 204 | 206 | ||
| 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 | 163 | 163 | ||
| 528 | 164 | >>> from zope.component import getUtility | 164 | >>> from zope.component import getUtility |
| 529 | 165 | >>> from canonical.launchpad.ftests import login, logout | 165 | >>> from canonical.launchpad.ftests import login, logout |
| 532 | 166 | >>> from canonical.launchpad.interfaces import ( | 166 | >>> from lp.registry.interfaces.person import IPersonSet |
| 533 | 167 | ... ILanguageSet, IPersonSet, IProductSet) | 167 | >>> from lp.registry.interfaces.product import IProductSet |
| 534 | 168 | >>> from lp.services.worlddata.interfaces.language import ILanguageSet | ||
| 535 | 168 | >>> from lp.translations.interfaces.translator import ITranslatorSet | 169 | >>> from lp.translations.interfaces.translator import ITranslatorSet |
| 536 | 169 | 170 | ||
| 537 | 170 | # Evolution uses Restricted mode, so a translation without reviewer | 171 | # Evolution uses Restricted mode, so a translation without reviewer |
| 538 | 171 | 172 | ||
| 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 | 52 | This is done to so see what the page will look like when they exist. | 52 | This is done to so see what the page will look like when they exist. |
| 544 | 53 | 53 | ||
| 545 | 54 | >>> from zope.component import getUtility | 54 | >>> from zope.component import getUtility |
| 547 | 55 | >>> from canonical.launchpad.interfaces import ILaunchpadCelebrities | 55 | >>> from canonical.launchpad.interfaces.launchpad import ( |
| 548 | 56 | ... ILaunchpadCelebrities) | ||
| 549 | 56 | >>> from lp.translations.interfaces.translationgroup import ( | 57 | >>> from lp.translations.interfaces.translationgroup import ( |
| 550 | 57 | ... TranslationPermission) | 58 | ... TranslationPermission) |
| 551 | 58 | >>> login('foo.bar@canonical.com') | 59 | >>> login('foo.bar@canonical.com') |
| 552 | 59 | 60 | ||
| 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 | 85 | >>> from zope.component import getUtility | 85 | >>> from zope.component import getUtility |
| 558 | 86 | 86 | ||
| 559 | 87 | >>> from canonical.launchpad.ftests import login, logout | 87 | >>> from canonical.launchpad.ftests import login, logout |
| 562 | 88 | >>> from canonical.launchpad.interfaces import ( | 88 | >>> from canonical.launchpad.interfaces.launchpad import ( |
| 563 | 89 | ... IDistributionSet, ILaunchpadCelebrities, IPersonSet) | 89 | ... ILaunchpadCelebrities) |
| 564 | 90 | >>> from lp.registry.interfaces.distribution import IDistributionSet | ||
| 565 | 91 | >>> from lp.registry.interfaces.person import IPersonSet | ||
| 566 | 92 | |||
| 567 | 90 | 93 | ||
| 568 | 91 | >>> # Log in so we can use utilities and the LaunchpadObjectFactory. | 94 | >>> # Log in so we can use utilities and the LaunchpadObjectFactory. |
| 569 | 92 | >>> login('foo.bar@canonical.com') | 95 | >>> login('foo.bar@canonical.com') |
| 570 | 93 | 96 | ||
| 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 | 501 | 501 | ||
| 576 | 502 | >>> from zope.component import getUtility | 502 | >>> from zope.component import getUtility |
| 577 | 503 | >>> from canonical.launchpad.ftests import login, logout | 503 | >>> from canonical.launchpad.ftests import login, logout |
| 580 | 504 | >>> from canonical.launchpad.interfaces import ( | 504 | >>> from lp.registry.interfaces.distribution import IDistributionSet |
| 581 | 505 | ... IDistributionSet, IPersonSet, ISourcePackageNameSet) | 505 | >>> from lp.registry.interfaces.person import IPersonSet |
| 582 | 506 | >>> from lp.registry.interfaces.sourcepackagename import ( | ||
| 583 | 507 | ... ISourcePackageNameSet) | ||
| 584 | 506 | >>> from lp.translations.interfaces.potemplate import IPOTemplateSet | 508 | >>> from lp.translations.interfaces.potemplate import IPOTemplateSet |
| 585 | 507 | >>> login("carlos@canonical.com") | 509 | >>> login("carlos@canonical.com") |
| 586 | 508 | >>> carlos = getUtility(IPersonSet).getByName('carlos') | 510 | >>> carlos = getUtility(IPersonSet).getByName('carlos') |
| 587 | 509 | 511 | ||
| 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 | 13 | 13 | ||
| 593 | 14 | >>> from zope.component import getUtility | 14 | >>> from zope.component import getUtility |
| 594 | 15 | >>> from canonical.launchpad.ftests import login, logout | 15 | >>> from canonical.launchpad.ftests import login, logout |
| 597 | 16 | >>> from canonical.launchpad.interfaces import ( | 16 | >>> from lp.registry.interfaces.distribution import IDistributionSet |
| 598 | 17 | ... ILanguageSet, IPersonSet, IDistributionSet) | 17 | >>> from lp.registry.interfaces.person import IPersonSet |
| 599 | 18 | >>> from lp.services.worlddata.interfaces.language import ILanguageSet | ||
| 600 | 18 | >>> from lp.translations.interfaces.translator import ITranslatorSet | 19 | >>> from lp.translations.interfaces.translator import ITranslatorSet |
| 601 | 19 | 20 | ||
| 602 | 20 | >>> login('foo.bar@canonical.com') | 21 | >>> login('foo.bar@canonical.com') |
| 603 | 21 | 22 | ||
| 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 | 4 | >>> from canonical.database.sqlbase import flush_database_updates | 4 | >>> from canonical.database.sqlbase import flush_database_updates |
| 609 | 5 | >>> from lp.translations.model.pomsgid import POMsgID | 5 | >>> from lp.translations.model.pomsgid import POMsgID |
| 610 | 6 | >>> from lp.translations.model.potemplate import POTemplate | 6 | >>> from lp.translations.model.potemplate import POTemplate |
| 612 | 7 | >>> from canonical.launchpad.interfaces import IPersonSet | 7 | >>> from lp.registry.interfaces.person import IPersonSet |
| 613 | 8 | >>> UTC = pytz.timezone('UTC') | 8 | >>> UTC = pytz.timezone('UTC') |
| 614 | 9 | 9 | ||
| 615 | 10 | Get the PO msgid we will be working with. | 10 | Get the PO msgid we will be working with. |
| 616 | 11 | 11 | ||
| 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 | 13 | from zope.security.proxy import removeSecurityProxy | 13 | from zope.security.proxy import removeSecurityProxy |
| 622 | 14 | 14 | ||
| 623 | 15 | from canonical.config import config | 15 | from canonical.config import config |
| 625 | 16 | from canonical.launchpad.interfaces import ILaunchpadCelebrities | 16 | from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities |
| 626 | 17 | from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet | 17 | from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet |
| 627 | 18 | from canonical.testing import LaunchpadZopelessLayer | 18 | from canonical.testing import LaunchpadZopelessLayer |
| 628 | 19 | from lp.buildmaster.enums import BuildStatus | 19 | from lp.buildmaster.enums import BuildStatus |
| 629 | 20 | 20 | ||
| 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 | 10 | from zope.event import notify | 10 | from zope.event import notify |
| 635 | 11 | from zope.security.proxy import removeSecurityProxy | 11 | from zope.security.proxy import removeSecurityProxy |
| 636 | 12 | 12 | ||
| 638 | 13 | from canonical.launchpad.interfaces import ILaunchpadCelebrities | 13 | from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities |
| 639 | 14 | from canonical.launchpad.webapp.interfaces import ( | 14 | from canonical.launchpad.webapp.interfaces import ( |
| 640 | 15 | DEFAULT_FLAVOR, | 15 | DEFAULT_FLAVOR, |
| 641 | 16 | IStoreSelector, | 16 | IStoreSelector, |
Woohoo!