Merge lp://staging/~sinzui/launchpad/apocalypse-interface-imports-7 into lp://staging/launchpad

Proposed by Curtis Hovey
Status: Merged
Approved by: Robert Collins
Approved revision: no longer in the source branch.
Merged at revision: 11767
Proposed branch: lp://staging/~sinzui/launchpad/apocalypse-interface-imports-7
Merge into: lp://staging/launchpad
Diff against target: 8038 lines (+1261/-882)
380 files modified
lib/canonical/database/ftests/test_multitablecopy.txt (+1/-1)
lib/canonical/launchpad/browser/ftests/logintoken-corner-cases.txt (+3/-3)
lib/canonical/launchpad/components/tests/decoratedresultset.txt (+1/-1)
lib/canonical/launchpad/doc/account.txt (+5/-3)
lib/canonical/launchpad/doc/announcement-date-widget.txt (+1/-1)
lib/canonical/launchpad/doc/batch_navigation.txt (+1/-1)
lib/canonical/launchpad/doc/canonical_url.txt (+1/-1)
lib/canonical/launchpad/doc/canonical_url_examples.txt (+8/-5)
lib/canonical/launchpad/doc/checkbox-matrix-widget.txt (+5/-2)
lib/canonical/launchpad/doc/emailauthentication.txt (+1/-1)
lib/canonical/launchpad/doc/feeds.txt (+1/-1)
lib/canonical/launchpad/doc/gpg-encryption.txt (+1/-1)
lib/canonical/launchpad/doc/gpghandler.txt (+4/-2)
lib/canonical/launchpad/doc/hasowner-authorization.txt (+2/-2)
lib/canonical/launchpad/doc/hierarchical-menu.txt (+3/-3)
lib/canonical/launchpad/doc/launchpad-container.txt (+2/-2)
lib/canonical/launchpad/doc/launchpad-target-widget.txt (+3/-3)
lib/canonical/launchpad/doc/launchpadform.txt (+2/-2)
lib/canonical/launchpad/doc/lazr-js-widgets.txt (+1/-1)
lib/canonical/launchpad/doc/librarian.txt (+4/-4)
lib/canonical/launchpad/doc/location-widget.txt (+1/-1)
lib/canonical/launchpad/doc/logintoken-pages.txt (+1/-1)
lib/canonical/launchpad/doc/logintoken.txt (+3/-3)
lib/canonical/launchpad/doc/looptuner.txt (+1/-1)
lib/canonical/launchpad/doc/lower-case-text-widget.txt (+2/-2)
lib/canonical/launchpad/doc/menus.txt (+3/-3)
lib/canonical/launchpad/doc/message.txt (+3/-2)
lib/canonical/launchpad/doc/navigation.txt (+1/-1)
lib/canonical/launchpad/doc/new-line-to-spaces-widget.txt (+1/-1)
lib/canonical/launchpad/doc/notification-recipient-set.txt (+1/-1)
lib/canonical/launchpad/doc/notification-text-escape.txt (+1/-1)
lib/canonical/launchpad/doc/oauth.txt (+8/-3)
lib/canonical/launchpad/doc/object-privacy.txt (+3/-2)
lib/canonical/launchpad/doc/package-relationship.txt (+1/-1)
lib/canonical/launchpad/doc/presenting-lengths-of-time.txt (+1/-1)
lib/canonical/launchpad/doc/project-scope-widget.txt (+2/-2)
lib/canonical/launchpad/doc/security-proxies.txt (+2/-2)
lib/canonical/launchpad/doc/signedmessage.txt (+2/-2)
lib/canonical/launchpad/doc/sqlobject-security-proxies.txt (+2/-2)
lib/canonical/launchpad/doc/storm.txt (+11/-4)
lib/canonical/launchpad/doc/stripped-text-widget.txt (+1/-1)
lib/canonical/launchpad/doc/textsearching.txt (+2/-2)
lib/canonical/launchpad/doc/timeout.txt (+3/-3)
lib/canonical/launchpad/doc/tokens-text-widget.txt (+1/-1)
lib/canonical/launchpad/doc/validation.txt (+7/-6)
lib/canonical/launchpad/doc/vocabularies.txt (+6/-4)
lib/canonical/launchpad/doc/webapp-authorization.txt (+2/-2)
lib/canonical/launchpad/doc/webapp-publication.txt (+5/-5)
lib/canonical/launchpad/doc/webservice-configuration.txt (+1/-1)
lib/canonical/launchpad/doc/webservice-marshallers.txt (+6/-4)
lib/canonical/launchpad/doc/xmlrpc-authserver.txt (+4/-2)
lib/canonical/launchpad/interfaces/ftests/validation.txt (+5/-4)
lib/canonical/launchpad/pagetests/feeds/xx-links.txt (+5/-2)
lib/canonical/launchpad/pagetests/oauth/access-token.txt (+4/-3)
lib/canonical/launchpad/pagetests/oauth/authorize-token.txt (+1/-1)
lib/canonical/launchpad/pagetests/oauth/managing-tokens.txt (+3/-2)
lib/canonical/launchpad/pagetests/standalone/xx-opstats.txt (+1/-1)
lib/canonical/launchpad/pagetests/standalone/xx-request-expired.txt (+1/-1)
lib/canonical/launchpad/pagetests/standalone/xx-soft-timeout.txt (+1/-1)
lib/canonical/launchpad/pagetests/webservice/xx-service.txt (+1/-1)
lib/canonical/launchpad/pagetests/webservice/xx-wadl.txt (+1/-1)
lib/canonical/launchpad/webapp/ftests/test_adapter_timeout.txt.disabled (+2/-2)
lib/canonical/launchpad/webapp/tests/test_preferredcharsets.txt (+1/-1)
lib/canonical/launchpad/webapp/tests/test_request_expire_render.txt (+1/-1)
lib/canonical/lazr/doc/menus.txt (+2/-2)
lib/canonical/lazr/doc/timeout.txt (+1/-1)
lib/lp/answers/browser/tests/views.txt (+2/-2)
lib/lp/answers/doc/emailinterface.txt.disabled (+2/-2)
lib/lp/answers/doc/expiration.txt (+2/-2)
lib/lp/answers/doc/faq-vocabulary.txt (+2/-2)
lib/lp/answers/doc/faq.txt (+2/-2)
lib/lp/answers/doc/faqtarget.txt (+1/-1)
lib/lp/answers/doc/notifications.txt (+2/-2)
lib/lp/answers/doc/person.txt (+1/-1)
lib/lp/answers/doc/projectgroup.txt (+1/-1)
lib/lp/answers/doc/question.txt (+3/-3)
lib/lp/answers/doc/questionsets.txt (+1/-1)
lib/lp/answers/doc/questiontarget.txt (+1/-1)
lib/lp/answers/doc/workflow.txt (+1/-1)
lib/lp/answers/stories/distribution-package-answer-contact.txt (+2/-2)
lib/lp/answers/tests/questiontarget-sourcepackage.txt (+1/-1)
lib/lp/app/browser/tests/base-layout.txt (+1/-1)
lib/lp/app/browser/tests/launchpadform-view.txt (+2/-2)
lib/lp/app/doc/tales.txt (+3/-3)
lib/lp/app/stories/basics/xx-beta-testers-redirection.txt (+2/-2)
lib/lp/archivepublisher/tests/archive-signing.txt (+1/-1)
lib/lp/archivepublisher/tests/publishing-meta-data-files.txt (+2/-2)
lib/lp/archiveuploader/tests/nascentupload-announcements.txt (+5/-4)
lib/lp/archiveuploader/tests/nascentupload-closing-bugs.txt (+3/-2)
lib/lp/archiveuploader/tests/nascentupload-packageset.txt (+5/-4)
lib/lp/archiveuploader/tests/nascentupload.txt (+5/-5)
lib/lp/archiveuploader/tests/upload-karma.txt (+2/-2)
lib/lp/archiveuploader/tests/uploadpolicy.txt (+2/-2)
lib/lp/blueprints/doc/spec-mail-exploder.txt (+1/-1)
lib/lp/blueprints/doc/specgraph.txt (+1/-1)
lib/lp/blueprints/doc/specification-branch.txt (+1/-1)
lib/lp/blueprints/doc/specification-notifications.txt (+1/-1)
lib/lp/blueprints/doc/specification.txt (+2/-2)
lib/lp/blueprints/doc/sprint-agenda.txt (+1/-1)
lib/lp/blueprints/doc/sprint-meeting-export.txt (+2/-2)
lib/lp/blueprints/doc/sprint.txt (+3/-3)
lib/lp/blueprints/stories/sprints/20-sprint-registration.txt (+1/-1)
lib/lp/bugs/browser/tests/bug-nomination-views.txt (+1/-1)
lib/lp/bugs/browser/tests/bug-views.txt (+13/-4)
lib/lp/bugs/browser/tests/buglinktarget-views.txt (+3/-2)
lib/lp/bugs/browser/tests/bugs-views.txt (+2/-2)
lib/lp/bugs/browser/tests/bugtask-adding-views.txt (+3/-3)
lib/lp/bugs/browser/tests/bugtask-edit-views.txt (+3/-3)
lib/lp/bugs/browser/tests/bugtask-search-views.txt (+3/-3)
lib/lp/bugs/browser/tests/distrosourcepackage-bug-views.txt (+2/-2)
lib/lp/bugs/browser/tests/person-bug-views.txt (+1/-1)
lib/lp/bugs/doc/bug-change.txt (+1/-1)
lib/lp/bugs/doc/bug-export.txt (+4/-3)
lib/lp/bugs/doc/bug-nomination.txt (+1/-1)
lib/lp/bugs/doc/bug-private-by-default.txt (+3/-2)
lib/lp/bugs/doc/bug-reported-acknowledgement.txt (+3/-2)
lib/lp/bugs/doc/bug-reporting-guidelines.txt (+3/-2)
lib/lp/bugs/doc/bug-set-status.txt (+2/-2)
lib/lp/bugs/doc/bug-tags.txt (+3/-3)
lib/lp/bugs/doc/bug.txt (+1/-1)
lib/lp/bugs/doc/bugactivity.txt (+8/-4)
lib/lp/bugs/doc/bugattachments.txt (+9/-4)
lib/lp/bugs/doc/bugcomment.txt (+1/-1)
lib/lp/bugs/doc/bugmessage-visibility.txt (+1/-1)
lib/lp/bugs/doc/bugnotification-email.txt (+12/-5)
lib/lp/bugs/doc/bugnotification-sending.txt (+3/-3)
lib/lp/bugs/doc/bugnotification-threading.txt (+1/-1)
lib/lp/bugs/doc/bugnotificationrecipients.txt (+2/-2)
lib/lp/bugs/doc/bugnotifications.txt (+11/-6)
lib/lp/bugs/doc/bugsubscription.txt (+5/-3)
lib/lp/bugs/doc/bugtarget.txt (+3/-2)
lib/lp/bugs/doc/bugtask-bugwatch-widget.txt (+1/-1)
lib/lp/bugs/doc/bugtask-expiration.txt (+7/-4)
lib/lp/bugs/doc/bugtask-find-similar.txt (+4/-3)
lib/lp/bugs/doc/bugtask-package-widget.txt (+1/-1)
lib/lp/bugs/doc/bugtask-retrieval.txt (+4/-2)
lib/lp/bugs/doc/bugtask-search.txt (+14/-7)
lib/lp/bugs/doc/bugtask-status-workflow.txt (+3/-2)
lib/lp/bugs/doc/bugtask.txt (+7/-5)
lib/lp/bugs/doc/bugtracker.txt (+3/-3)
lib/lp/bugs/doc/bugwatch.txt (+13/-8)
lib/lp/bugs/doc/bugwidget.txt (+1/-1)
lib/lp/bugs/doc/bugzilla-import.txt (+3/-2)
lib/lp/bugs/doc/checkwatches-batching.txt (+1/-1)
lib/lp/bugs/doc/checkwatches-cli-switches.txt (+1/-1)
lib/lp/bugs/doc/checkwatches.txt (+6/-7)
lib/lp/bugs/doc/displaying-bugs-and-tasks.txt (+6/-4)
lib/lp/bugs/doc/externalbugtracker-bug-imports.txt (+3/-3)
lib/lp/bugs/doc/externalbugtracker-bugzilla-api.txt (+1/-1)
lib/lp/bugs/doc/externalbugtracker-bugzilla-lp-plugin.txt (+1/-1)
lib/lp/bugs/doc/externalbugtracker-bugzilla-oddities.txt (+2/-2)
lib/lp/bugs/doc/externalbugtracker-bugzilla.txt (+4/-3)
lib/lp/bugs/doc/externalbugtracker-comment-imports.txt (+8/-5)
lib/lp/bugs/doc/externalbugtracker-comment-pushing.txt (+9/-7)
lib/lp/bugs/doc/externalbugtracker-debbugs.txt (+7/-5)
lib/lp/bugs/doc/externalbugtracker-emailaddress.txt (+5/-2)
lib/lp/bugs/doc/externalbugtracker-mantis-csv.txt (+1/-1)
lib/lp/bugs/doc/externalbugtracker-mantis.txt (+3/-3)
lib/lp/bugs/doc/externalbugtracker-roundup.txt (+3/-3)
lib/lp/bugs/doc/externalbugtracker-rt.txt (+6/-5)
lib/lp/bugs/doc/externalbugtracker-sourceforge.txt (+3/-3)
lib/lp/bugs/doc/externalbugtracker-trac-lp-plugin.txt (+5/-3)
lib/lp/bugs/doc/externalbugtracker-trac.txt (+4/-4)
lib/lp/bugs/doc/externalbugtracker.txt (+1/-1)
lib/lp/bugs/doc/hasbugs.txt (+6/-3)
lib/lp/bugs/doc/initial-bug-contacts.txt (+1/-1)
lib/lp/bugs/doc/malone-karma.txt (+8/-4)
lib/lp/bugs/doc/malone-xmlrpc.txt (+7/-5)
lib/lp/bugs/doc/official-bug-tags.txt (+2/-2)
lib/lp/bugs/doc/security-teams.txt (+4/-4)
lib/lp/bugs/doc/sourceforge-remote-products.txt (+1/-1)
lib/lp/bugs/stories/bug-privacy/40-unsubscribe-from-private-bug.txt (+4/-3)
lib/lp/bugs/stories/bug-tags/xx-official-bug-tags.txt (+1/-1)
lib/lp/bugs/stories/bugattachments/xx-attachments-to-bug-report.txt (+1/-1)
lib/lp/bugs/stories/bugs/xx-bug-nomination-table-row.txt (+1/-1)
lib/lp/bugs/stories/bugs/xx-bugs-advanced-search-upstream-status.txt (+3/-2)
lib/lp/bugs/stories/bugs/xx-front-page-bug-lists.txt (+5/-2)
lib/lp/bugs/stories/bugs/xx-incomplete-bugs.txt (+1/-1)
lib/lp/bugs/stories/bugs/xx-portlets-bug-milestones.txt (+1/-1)
lib/lp/bugs/stories/bugs/xx-remote-bug-comments.txt (+1/-1)
lib/lp/bugs/stories/bugtask-management/xx-bug-importance-change.txt (+3/-2)
lib/lp/bugs/stories/bugtask-searches/xx-listing-basics.txt (+3/-2)
lib/lp/bugs/stories/bugtask-searches/xx-searching-by-tags.txt (+3/-2)
lib/lp/bugs/stories/bugwatches/xx-edit-bugwatch.txt (+1/-1)
lib/lp/bugs/stories/cve/cve-linking.txt (+1/-1)
lib/lp/bugs/stories/feeds/xx-bug-atom.txt (+1/-1)
lib/lp/bugs/stories/feeds/xx-bug-html.txt (+4/-2)
lib/lp/bugs/stories/structural-subscriptions/xx-bug-subscriptions.txt (+2/-2)
lib/lp/bugs/stories/webservice/xx-bug.txt (+1/-1)
lib/lp/bugs/tests/buglinktarget.txt (+5/-2)
lib/lp/bugs/tests/bugs-emailinterface.txt (+6/-7)
lib/lp/bugs/tests/bugtarget-questiontarget.txt (+5/-4)
lib/lp/code/doc/branch-merge-proposal-notifications.txt (+1/-1)
lib/lp/code/doc/branch-visibility.txt (+1/-1)
lib/lp/code/doc/codeimport-event.txt (+1/-1)
lib/lp/code/doc/codeimport-job.txt (+1/-1)
lib/lp/code/doc/codeimport.txt (+2/-2)
lib/lp/code/stories/branches/xx-branch-deletion.txt (+1/-1)
lib/lp/code/stories/branches/xx-branch-index.txt (+2/-2)
lib/lp/code/stories/branches/xx-branchmergeproposal-listings.txt (+1/-1)
lib/lp/code/stories/branches/xx-branchmergeproposals.txt (+2/-2)
lib/lp/code/stories/branches/xx-creating-branches.txt (+2/-2)
lib/lp/code/stories/branches/xx-private-branch-listings.txt (+1/-1)
lib/lp/code/stories/codeimport/xx-failing-codeimport.txt (+1/-1)
lib/lp/code/stories/feeds/xx-revision-atom.txt (+1/-1)
lib/lp/code/stories/webservice/xx-branch.txt (+1/-1)
lib/lp/coop/answersbugs/stories/question-buglink.txt (+1/-1)
lib/lp/coop/answersbugs/tests/notifications-linked-bug.txt (+2/-2)
lib/lp/hardwaredb/doc/hwdb-device-tables.txt (+4/-2)
lib/lp/hardwaredb/doc/hwdb-submission.txt (+1/-1)
lib/lp/hardwaredb/doc/hwdb.txt (+8/-6)
lib/lp/registry/browser/tests/coc-views.txt (+1/-1)
lib/lp/registry/browser/tests/milestone-views.txt (+2/-2)
lib/lp/registry/browser/tests/peoplemerge-views.txt (+1/-1)
lib/lp/registry/browser/tests/person-admin-views.txt (+1/-1)
lib/lp/registry/browser/tests/person-views.txt (+2/-4)
lib/lp/registry/browser/tests/pillar-views.txt (+2/-2)
lib/lp/registry/browser/tests/poll-views_0.txt (+2/-2)
lib/lp/registry/browser/tests/private-team-creation-views.txt (+4/-2)
lib/lp/registry/browser/tests/product-portlet-packages-view.txt (+5/-3)
lib/lp/registry/browser/tests/product-views.txt (+2/-2)
lib/lp/registry/browser/tests/team-views.txt (+2/-2)
lib/lp/registry/doc/announcement.txt (+4/-2)
lib/lp/registry/doc/commercialsubscription.txt (+2/-2)
lib/lp/registry/doc/distribution-mirror.txt (+13/-5)
lib/lp/registry/doc/distribution-sourcepackage.txt (+3/-3)
lib/lp/registry/doc/distribution.txt (+3/-6)
lib/lp/registry/doc/distroseries.txt (+11/-10)
lib/lp/registry/doc/entitlement.txt (+10/-5)
lib/lp/registry/doc/featuredproject.txt (+4/-3)
lib/lp/registry/doc/gpg-signatures.txt (+1/-1)
lib/lp/registry/doc/gpgkey.txt (+5/-2)
lib/lp/registry/doc/irc.txt (+1/-1)
lib/lp/registry/doc/jabber.txt (+1/-1)
lib/lp/registry/doc/karmacache.txt (+3/-3)
lib/lp/registry/doc/karmacontext.txt (+4/-2)
lib/lp/registry/doc/mailinglist-subscriptions-xmlrpc.txt (+2/-2)
lib/lp/registry/doc/mailinglists.txt (+5/-3)
lib/lp/registry/doc/mentoringoffer.txt (+8/-5)
lib/lp/registry/doc/message-holds.txt (+1/-1)
lib/lp/registry/doc/milestone.txt (+6/-5)
lib/lp/registry/doc/person-account.txt (+3/-3)
lib/lp/registry/doc/person-karma.txt (+5/-3)
lib/lp/registry/doc/person-notification.txt (+1/-1)
lib/lp/registry/doc/person.txt (+15/-10)
lib/lp/registry/doc/personlocation.txt (+2/-2)
lib/lp/registry/doc/pillar-aliases-field.txt (+1/-1)
lib/lp/registry/doc/pillar.txt (+6/-5)
lib/lp/registry/doc/poll-preconditions.txt (+1/-1)
lib/lp/registry/doc/poll.txt (+6/-2)
lib/lp/registry/doc/product-widgets.txt (+2/-2)
lib/lp/registry/doc/product.txt (+5/-2)
lib/lp/registry/doc/productrelease-file-download.txt (+3/-3)
lib/lp/registry/doc/productseries.txt (+7/-4)
lib/lp/registry/doc/projectgroup.txt (+4/-2)
lib/lp/registry/doc/sshkey.txt (+5/-2)
lib/lp/registry/doc/standing.txt (+6/-4)
lib/lp/registry/doc/structural-subscriptions.txt (+5/-5)
lib/lp/registry/doc/team-nav-menus.txt (+3/-3)
lib/lp/registry/doc/teammembership-email-notification.txt (+8/-4)
lib/lp/registry/doc/teammembership.txt (+5/-3)
lib/lp/registry/doc/user-to-user.txt (+1/-1)
lib/lp/registry/doc/wikiname.txt (+1/-1)
lib/lp/registry/stories/announcements/xx-announcements.txt (+4/-2)
lib/lp/registry/stories/distributionmirror/xx-distribution-countrymirrors.txt (+2/-2)
lib/lp/registry/stories/gpg-coc/01-claimgpg.txt (+2/-2)
lib/lp/registry/stories/gpg-coc/04-reactivategpg.txt (+1/-1)
lib/lp/registry/stories/gpg-coc/11-handle-special-keys.txt (+1/-1)
lib/lp/registry/stories/mailinglists/lifecycle.txt (+1/-1)
lib/lp/registry/stories/mailinglists/subscriptions.txt (+2/-2)
lib/lp/registry/stories/person/xx-person-editgpgkeys-invalid-key.txt (+3/-3)
lib/lp/registry/stories/pillar/xx-pillar-deactivation.txt (+2/-2)
lib/lp/registry/stories/productrelease/xx-productrelease-basics.txt (+1/-1)
lib/lp/registry/stories/team/xx-adminteammerge.txt (+1/-1)
lib/lp/registry/stories/team/xx-team-membership.txt (+2/-2)
lib/lp/registry/stories/teammembership/10-join-team.txt (+1/-1)
lib/lp/registry/stories/teammembership/xx-expire-subscription.txt (+1/-1)
lib/lp/registry/stories/teammembership/xx-member-renewed-membership.txt (+5/-2)
lib/lp/registry/stories/vouchers/xx-voucher-redemption.txt (+1/-1)
lib/lp/registry/stories/webservice/xx-distribution-mirror.txt (+1/-1)
lib/lp/registry/stories/webservice/xx-distribution.txt (+1/-1)
lib/lp/registry/stories/webservice/xx-person.txt (+1/-1)
lib/lp/registry/stories/webservice/xx-private-team.txt (+1/-1)
lib/lp/registry/tests/structural-subscription-target.txt (+1/-2)
lib/lp/services/fields/doc/uri-field.txt (+2/-2)
lib/lp/services/inlinehelp/README.txt (+3/-3)
lib/lp/services/mail/tests/incomingmail.txt (+2/-2)
lib/lp/services/mailman/doc/batching.txt (+1/-1)
lib/lp/services/mailman/doc/bounces.txt (+1/-1)
lib/lp/services/mailman/doc/postings.txt (+2/-2)
lib/lp/services/mailman/doc/recovery.txt (+4/-2)
lib/lp/services/mailman/doc/staging.txt (+1/-1)
lib/lp/services/mailman/doc/subscriptions.txt (+2/-2)
lib/lp/services/memcache/doc/tales-cache.txt (+2/-2)
lib/lp/soyuz/browser/tests/binarypackagerelease-views.txt (+2/-2)
lib/lp/soyuz/browser/tests/build-views.txt (+1/-1)
lib/lp/soyuz/browser/tests/builder-views.txt (+2/-2)
lib/lp/soyuz/browser/tests/distroseriesqueue-views.txt (+2/-2)
lib/lp/soyuz/browser/tests/sourcepackage-views.txt (+1/-1)
lib/lp/soyuz/doc/archive-files.txt (+1/-1)
lib/lp/soyuz/doc/archivepermission.txt (+3/-2)
lib/lp/soyuz/doc/binarypackagebuild.txt (+3/-3)
lib/lp/soyuz/doc/binarypackagerelease.txt (+7/-6)
lib/lp/soyuz/doc/buildd-dispatching.txt (+1/-1)
lib/lp/soyuz/doc/buildd-scoring.txt (+2/-3)
lib/lp/soyuz/doc/buildd-slavescanner.txt (+2/-2)
lib/lp/soyuz/doc/closing-bugs-from-changelogs.txt (+2/-2)
lib/lp/soyuz/doc/components-and-sections.txt (+3/-3)
lib/lp/soyuz/doc/distribution.txt (+2/-2)
lib/lp/soyuz/doc/distroarchseries.txt (+5/-6)
lib/lp/soyuz/doc/distroarchseriesbinarypackage.txt (+5/-6)
lib/lp/soyuz/doc/distroseries-publishing-lookups.txt (+2/-2)
lib/lp/soyuz/doc/distroseriesqueue-dist-upgrader.txt (+1/-1)
lib/lp/soyuz/doc/distroseriesqueue-notify.txt (+1/-1)
lib/lp/soyuz/doc/distroseriesqueue-translations.txt (+2/-2)
lib/lp/soyuz/doc/distroseriesqueue.txt (+8/-9)
lib/lp/soyuz/doc/fakepackager.txt (+2/-2)
lib/lp/soyuz/doc/gina-multiple-arch.txt (+1/-1)
lib/lp/soyuz/doc/manage-chroot.txt (+1/-1)
lib/lp/soyuz/doc/package-diff.txt (+5/-5)
lib/lp/soyuz/doc/package-meta-classes.txt (+2/-3)
lib/lp/soyuz/doc/packagecopyrequest.txt (+3/-3)
lib/lp/soyuz/doc/pocketchroot.txt (+1/-1)
lib/lp/soyuz/doc/publishing.txt (+16/-12)
lib/lp/soyuz/doc/queuebuilder.txt (+1/-1)
lib/lp/soyuz/doc/sourcepackagerelease-build-lookup.txt (+2/-2)
lib/lp/soyuz/doc/sourcepackagerelease.txt (+6/-5)
lib/lp/soyuz/doc/soyuz-files.txt (+7/-4)
lib/lp/soyuz/doc/soyuz-set-of-uploads.txt (+6/-4)
lib/lp/soyuz/doc/soyuz-upload.txt (+11/-5)
lib/lp/soyuz/stories/ppa/xx-copy-packages.txt (+2/-2)
lib/lp/soyuz/stories/ppa/xx-delete-packages.txt (+3/-2)
lib/lp/soyuz/stories/ppa/xx-ppa-files.txt (+1/-1)
lib/lp/soyuz/stories/ppa/xx-ppa-packages.txt (+1/-2)
lib/lp/soyuz/stories/ppa/xx-private-ppa-subscriptions.txt (+1/-1)
lib/lp/soyuz/stories/soyuz/xx-builds-pages.txt (+2/-2)
lib/lp/soyuz/stories/soyuz/xx-distribution-archives.txt (+1/-2)
lib/lp/soyuz/stories/soyuz/xx-package-diff.txt (+4/-4)
lib/lp/soyuz/stories/soyuz/xx-person-packages.txt (+2/-2)
lib/lp/soyuz/stories/soyuz/xx-private-builds.txt (+2/-2)
lib/lp/soyuz/stories/soyuz/xx-queue-pages-delayed-copies.txt (+1/-1)
lib/lp/soyuz/stories/soyuz/xx-queue-pages-motu.txt (+3/-2)
lib/lp/soyuz/stories/soyuz/xx-queue-pages.txt (+4/-4)
lib/lp/soyuz/stories/webservice/xx-archive.txt (+1/-1)
lib/lp/soyuz/stories/webservice/xx-archivedependency.txt (+1/-1)
lib/lp/soyuz/stories/webservice/xx-binary-package-publishing.txt (+1/-1)
lib/lp/soyuz/stories/webservice/xx-builds.txt (+3/-3)
lib/lp/soyuz/stories/webservice/xx-packageupload.txt (+2/-2)
lib/lp/soyuz/stories/webservice/xx-source-package-publishing.txt (+5/-5)
lib/lp/translations/browser/tests/pofile-base-views.txt (+1/-1)
lib/lp/translations/browser/tests/pofile-views.txt (+3/-3)
lib/lp/translations/browser/tests/potemplate-views.txt (+2/-2)
lib/lp/translations/browser/tests/translationimportqueue-views.txt (+1/-1)
lib/lp/translations/browser/tests/translationmessage-views.txt (+3/-3)
lib/lp/translations/doc/language-pack.txt (+1/-1)
lib/lp/translations/doc/poexport-language-pack.txt (+3/-3)
lib/lp/translations/doc/poexport-request-productseries.txt (+1/-1)
lib/lp/translations/doc/pofile.txt (+3/-3)
lib/lp/translations/doc/poimport.txt (+1/-1)
lib/lp/translations/doc/potemplate.txt (+1/-1)
lib/lp/translations/doc/potmsgset.txt (+3/-3)
lib/lp/translations/doc/rosetta-karma.txt (+1/-1)
lib/lp/translations/doc/translationimportqueue.txt (+1/-1)
lib/lp/translations/doc/translationmessage-destroy.txt (+1/-1)
lib/lp/translations/doc/translationmessage.txt (+1/-1)
lib/lp/translations/doc/translations-export-to-branch.txt (+1/-1)
lib/lp/translations/doc/translationsoverview.txt (+2/-2)
lib/lp/translations/doc/translationtemplatesbuildbehavior.txt (+1/-1)
lib/lp/translations/stories/buildfarm/xx-build-summary.txt (+1/-1)
lib/lp/translations/stories/productseries/xx-productseries-translations.txt (+1/-1)
lib/lp/translations/stories/standalone/xx-pofile-translate-message-filtering.txt (+1/-1)
lib/lp/translations/stories/standalone/xx-potemplate-edit.txt (+1/-1)
lib/lp/translations/stories/standalone/xx-sourcepackage-export.txt (+2/-2)
lib/lp/translations/stories/standalone/xx-translation-access-display.txt (+1/-1)
lib/lp/translations/stories/standalone/xx-translationmessage-translate.txt (+1/-1)
lib/lp/translations/stories/translationgroups/30-show-group-translation-targets.txt (+2/-2)
lib/lp/translations/stories/translationgroups/60-translation-suggestions.txt (+2/-2)
lib/lp/translations/tests/potmsgset-update-translation.txt (+1/-1)
utilities/migrater/deglob.py (+161/-2)
utilities/migrater/find.py (+30/-28)
To merge this branch: bzr merge lp://staging/~sinzui/launchpad/apocalypse-interface-imports-7
Reviewer Review Type Date Requested Status
Aaron Bentley (community) Approve
Robert Collins (community) Approve
Review via email: mp+38727@code.staging.launchpad.net

Description of the change

This is my branch to fix the remaining glob imports in doctests.

    lp:~sinzui/launchpad/apocalypse-interface-imports-7
    Diff size: 2979
    Launchpad bug: https://bugs.launchpad.net/bugs/662669
    Test command: The whole test suite.
    Pre-implementation: no one
    Target release: 10.11

Fix the remaining glob imports in doctests
------------------------------------------

Do not import from canonical.launchpad.interfaces in doctests.

Rules
-----

    * Update the deglobber to expand multi-line import to single line imports
    * Then run the deglob doctest rules.
    * Send to ec2 to verify the tests run.

QA
--

None.

Lint
----

Lint hates these files. There are lots of long lines, moin headers, and
indentation issues. I am not inclined to fix these at this time since I
believe many of these tests should be unittests instead.

Test
----

All test changes were made via the script--no direct edits were made.

Implementation
--------------

    * Modified the deglobber helper. This is really a script that will always
      require hacks to help fix the imports from c.l.i.

To post a comment you must log in.
Revision history for this message
Aaron Bentley (abentley) wrote :

Some of the reformatted imports repeat the module name (e.g. lines 25-26). AIUI, this is because a script, rather than a person, did the conversion. Please investigate updating the script to do multiline imports instead.

Revision history for this message
Robert Collins (lifeless) wrote :

Edwin has a script that can fix that, perhaps run it afterwards?

Revision history for this message
Curtis Hovey (sinzui) wrote :

I sorted the imports in all the doctests. This is a much larger change because doctests never enforced alphabetical order. I reduced the size of the change by ensuring zope imports are listed first, as we do in modules.

I have verified all the tests run and pass.

Revision history for this message
Robert Collins (lifeless) wrote :

Thanks curtis.

review: Approve
Revision history for this message
Aaron Bentley (abentley) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.