launchpad-reviewers team mailing list archive
-
launchpad-reviewers team
-
Mailing list archive
-
Message #03891
[Merge] lp:~allenap/launchpad/initialise-to-initialize into lp:launchpad
Gavin Panella has proposed merging lp:~allenap/launchpad/initialise-to-initialize into lp:launchpad.
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~allenap/launchpad/initialise-to-initialize/+merge/64121
This normalizes the use of American English spelling for a single term: initialize. This branch passes in ec2, but I would appreciate a sanity check.
--
https://code.launchpad.net/~allenap/launchpad/initialise-to-initialize/+merge/64121
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~allenap/launchpad/initialise-to-initialize into lp:launchpad.
=== modified file 'configs/development/launchpad-lazr.conf'
--- configs/development/launchpad-lazr.conf 2011-05-10 08:28:07 +0000
+++ configs/development/launchpad-lazr.conf 2011-06-10 08:21:09 +0000
@@ -140,7 +140,7 @@
host: keyserver.launchpad.dev
public_host: keyserver.launchpad.dev
-[initialisedistroseries]
+[initializedistroseries]
oops_prefix: IDSJ
error_dir: /var/tmp/soyuz.test
=== modified file 'cronscripts/buildd-queue-builder.py'
--- cronscripts/buildd-queue-builder.py 2010-12-22 00:07:36 +0000
+++ cronscripts/buildd-queue-builder.py 2011-06-10 08:21:09 +0000
@@ -2,7 +2,7 @@
#
# Copyright 2009 Canonical Ltd. This software is licensed under the
# GNU Affero General Public License version 3 (see the file LICENSE).
-"""Build Jobs initialisation."""
+"""Build Jobs initialization."""
__metaclass__ = type
=== modified file 'database/sampledata/current-dev.sql'
--- database/sampledata/current-dev.sql 2011-06-06 21:40:15 +0000
+++ database/sampledata/current-dev.sql 2011-06-10 08:21:09 +0000
@@ -1987,7 +1987,7 @@
The Landscape system consists of two major parts: a client daemon which delivers information to the server and acts on server-provided requests; and a web server responsible for handling communication with clients and the user interface itself.', '2006-07-11 19:59:17.311451', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, true, NULL, false, NULL, 1, false, true, 64, NULL, NULL, NULL, 9, NULL, NULL, NULL, NULL, false, true, false, NULL, false, false, NULL, NULL, false, 12, NULL, NULL, NULL, NULL, NULL, 10, 10, 10, true);
INSERT INTO product (id, project, owner, name, displayname, title, summary, description, datecreated, homepageurl, screenshotsurl, wikiurl, listurl, programminglang, downloadurl, lastdoap, sourceforgeproject, freshmeatproject, reviewed, active, fti, autoupdate, translationgroup, translationpermission, official_rosetta, official_malone, bug_supervisor, security_contact, driver, bugtracker, development_focus, homepage_content, icon, mugshot, logo, official_answers, private_bugs, private_specs, license_info, official_blueprints, enable_bug_expiration, bug_reporting_guidelines, reviewer_whiteboard, license_approved, registrant, remote_product, translation_focus, max_bug_heat, date_next_suggest_packaging, bug_reported_acknowledgement, answers_usage, blueprints_usage, translations_usage, enable_bugfiling_duplicate_search) VALUES (17, NULL, 12, 'launchpad', 'Launchpad', 'Launchpad', 'Launchpad is a catalogue of libre software projects and products. Projects registered in the Launchpad are linked to their translations in Rosetta, their bugs in Malone, their RCS imports in Bazaar, and their packages in Soyuz.', 'Launchpad''s design is inspired by the Description of a Project (DOAP) framework by Edd Dumbill, with extensions for actual releases of products.', '2006-11-24 12:48:19.178553', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, true, NULL, false, NULL, 1, false, true, NULL, NULL, NULL, NULL, 19, NULL, NULL, NULL, NULL, true, false, false, NULL, false, false, NULL, NULL, false, 12, NULL, NULL, NULL, NULL, NULL, 20, 10, 10, true);
-INSERT INTO product (id, project, owner, name, displayname, title, summary, description, datecreated, homepageurl, screenshotsurl, wikiurl, listurl, programminglang, downloadurl, lastdoap, sourceforgeproject, freshmeatproject, reviewed, active, fti, autoupdate, translationgroup, translationpermission, official_rosetta, official_malone, bug_supervisor, security_contact, driver, bugtracker, development_focus, homepage_content, icon, mugshot, logo, official_answers, private_bugs, private_specs, license_info, official_blueprints, enable_bug_expiration, bug_reporting_guidelines, reviewer_whiteboard, license_approved, registrant, remote_product, translation_focus, max_bug_heat, date_next_suggest_packaging, bug_reported_acknowledgement, answers_usage, blueprints_usage, translations_usage, enable_bugfiling_duplicate_search) VALUES (18, NULL, 37, 'upstart', 'Upstart', 'The Upstart System Initialisation Process', 'Event-based init daemon.', 'upstart is a replacement for the /sbin/init daemon which handles starting of tasks and services during boot, stopping them during shutdown and supervising them while the system is running.', '2007-03-14 18:47:04.891546', 'http://upstart.ubuntu.com/', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, true, NULL, false, NULL, 1, false, false, NULL, NULL, NULL, NULL, 20, NULL, NULL, NULL, NULL, false, false, false, NULL, false, false, NULL, NULL, false, 37, NULL, NULL, NULL, NULL, NULL, 10, 10, 10, true);
+INSERT INTO product (id, project, owner, name, displayname, title, summary, description, datecreated, homepageurl, screenshotsurl, wikiurl, listurl, programminglang, downloadurl, lastdoap, sourceforgeproject, freshmeatproject, reviewed, active, fti, autoupdate, translationgroup, translationpermission, official_rosetta, official_malone, bug_supervisor, security_contact, driver, bugtracker, development_focus, homepage_content, icon, mugshot, logo, official_answers, private_bugs, private_specs, license_info, official_blueprints, enable_bug_expiration, bug_reporting_guidelines, reviewer_whiteboard, license_approved, registrant, remote_product, translation_focus, max_bug_heat, date_next_suggest_packaging, bug_reported_acknowledgement, answers_usage, blueprints_usage, translations_usage, enable_bugfiling_duplicate_search) VALUES (18, NULL, 37, 'upstart', 'Upstart', 'The Upstart System Initialization Process', 'Event-based init daemon.', 'upstart is a replacement for the /sbin/init daemon which handles starting of tasks and services during boot, stopping them during shutdown and supervising them while the system is running.', '2007-03-14 18:47:04.891546', 'http://upstart.ubuntu.com/', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, true, NULL, false, NULL, 1, false, false, NULL, NULL, NULL, NULL, 20, NULL, NULL, NULL, NULL, false, false, false, NULL, false, false, NULL, NULL, false, 37, NULL, NULL, NULL, NULL, NULL, 10, 10, 10, true);
INSERT INTO product (id, project, owner, name, displayname, title, summary, description, datecreated, homepageurl, screenshotsurl, wikiurl, listurl, programminglang, downloadurl, lastdoap, sourceforgeproject, freshmeatproject, reviewed, active, fti, autoupdate, translationgroup, translationpermission, official_rosetta, official_malone, bug_supervisor, security_contact, driver, bugtracker, development_focus, homepage_content, icon, mugshot, logo, official_answers, private_bugs, private_specs, license_info, official_blueprints, enable_bug_expiration, bug_reporting_guidelines, reviewer_whiteboard, license_approved, registrant, remote_product, translation_focus, max_bug_heat, date_next_suggest_packaging, bug_reported_acknowledgement, answers_usage, blueprints_usage, translations_usage, enable_bugfiling_duplicate_search) VALUES (19, NULL, 28, 'aptoncd', 'APTonCD', 'APTonCD, Get APT Anywhere', 'A simple yet powerful tool which allows you to create one (or more) CD/DVD-Repository containing all of the packages downloaded via apt-get or aptitude.', 'A GUI-based tool that allows you to create a CD/DVD with all downloaded packages with APT-GET, creating a removable-repository.
With aptoncd you can:
=== modified file 'database/sampledata/current.sql'
--- database/sampledata/current.sql 2011-06-06 21:40:15 +0000
+++ database/sampledata/current.sql 2011-06-10 08:21:09 +0000
@@ -1985,7 +1985,7 @@
The Landscape system consists of two major parts: a client daemon which delivers information to the server and acts on server-provided requests; and a web server responsible for handling communication with clients and the user interface itself.', '2006-07-11 19:59:17.311451', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, true, NULL, false, NULL, 1, false, true, 64, NULL, NULL, NULL, 9, NULL, NULL, NULL, NULL, false, true, false, NULL, false, false, NULL, NULL, false, 12, NULL, NULL, NULL, NULL, NULL, 10, 10, 10, true);
INSERT INTO product (id, project, owner, name, displayname, title, summary, description, datecreated, homepageurl, screenshotsurl, wikiurl, listurl, programminglang, downloadurl, lastdoap, sourceforgeproject, freshmeatproject, reviewed, active, fti, autoupdate, translationgroup, translationpermission, official_rosetta, official_malone, bug_supervisor, security_contact, driver, bugtracker, development_focus, homepage_content, icon, mugshot, logo, official_answers, private_bugs, private_specs, license_info, official_blueprints, enable_bug_expiration, bug_reporting_guidelines, reviewer_whiteboard, license_approved, registrant, remote_product, translation_focus, max_bug_heat, date_next_suggest_packaging, bug_reported_acknowledgement, answers_usage, blueprints_usage, translations_usage, enable_bugfiling_duplicate_search) VALUES (17, NULL, 12, 'launchpad', 'Launchpad', 'Launchpad', 'Launchpad is a catalogue of libre software projects and products. Projects registered in the Launchpad are linked to their translations in Rosetta, their bugs in Malone, their RCS imports in Bazaar, and their packages in Soyuz.', 'Launchpad''s design is inspired by the Description of a Project (DOAP) framework by Edd Dumbill, with extensions for actual releases of products.', '2006-11-24 12:48:19.178553', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, true, NULL, false, NULL, 1, false, true, NULL, NULL, NULL, NULL, 19, NULL, NULL, NULL, NULL, true, false, false, NULL, false, false, NULL, NULL, false, 12, NULL, NULL, NULL, NULL, NULL, 10, 10, 10, true);
-INSERT INTO product (id, project, owner, name, displayname, title, summary, description, datecreated, homepageurl, screenshotsurl, wikiurl, listurl, programminglang, downloadurl, lastdoap, sourceforgeproject, freshmeatproject, reviewed, active, fti, autoupdate, translationgroup, translationpermission, official_rosetta, official_malone, bug_supervisor, security_contact, driver, bugtracker, development_focus, homepage_content, icon, mugshot, logo, official_answers, private_bugs, private_specs, license_info, official_blueprints, enable_bug_expiration, bug_reporting_guidelines, reviewer_whiteboard, license_approved, registrant, remote_product, translation_focus, max_bug_heat, date_next_suggest_packaging, bug_reported_acknowledgement, answers_usage, blueprints_usage, translations_usage, enable_bugfiling_duplicate_search) VALUES (18, NULL, 37, 'upstart', 'Upstart', 'The Upstart System Initialisation Process', 'Event-based init daemon.', 'upstart is a replacement for the /sbin/init daemon which handles starting of tasks and services during boot, stopping them during shutdown and supervising them while the system is running.', '2007-03-14 18:47:04.891546', 'http://upstart.ubuntu.com/', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, true, NULL, false, NULL, 1, false, false, NULL, NULL, NULL, NULL, 20, NULL, NULL, NULL, NULL, false, false, false, NULL, false, false, NULL, NULL, false, 37, NULL, NULL, NULL, NULL, NULL, 10, 10, 10, true);
+INSERT INTO product (id, project, owner, name, displayname, title, summary, description, datecreated, homepageurl, screenshotsurl, wikiurl, listurl, programminglang, downloadurl, lastdoap, sourceforgeproject, freshmeatproject, reviewed, active, fti, autoupdate, translationgroup, translationpermission, official_rosetta, official_malone, bug_supervisor, security_contact, driver, bugtracker, development_focus, homepage_content, icon, mugshot, logo, official_answers, private_bugs, private_specs, license_info, official_blueprints, enable_bug_expiration, bug_reporting_guidelines, reviewer_whiteboard, license_approved, registrant, remote_product, translation_focus, max_bug_heat, date_next_suggest_packaging, bug_reported_acknowledgement, answers_usage, blueprints_usage, translations_usage, enable_bugfiling_duplicate_search) VALUES (18, NULL, 37, 'upstart', 'Upstart', 'The Upstart System Initialization Process', 'Event-based init daemon.', 'upstart is a replacement for the /sbin/init daemon which handles starting of tasks and services during boot, stopping them during shutdown and supervising them while the system is running.', '2007-03-14 18:47:04.891546', 'http://upstart.ubuntu.com/', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, false, true, NULL, false, NULL, 1, false, false, NULL, NULL, NULL, NULL, 20, NULL, NULL, NULL, NULL, false, false, false, NULL, false, false, NULL, NULL, false, 37, NULL, NULL, NULL, NULL, NULL, 10, 10, 10, true);
INSERT INTO product (id, project, owner, name, displayname, title, summary, description, datecreated, homepageurl, screenshotsurl, wikiurl, listurl, programminglang, downloadurl, lastdoap, sourceforgeproject, freshmeatproject, reviewed, active, fti, autoupdate, translationgroup, translationpermission, official_rosetta, official_malone, bug_supervisor, security_contact, driver, bugtracker, development_focus, homepage_content, icon, mugshot, logo, official_answers, private_bugs, private_specs, license_info, official_blueprints, enable_bug_expiration, bug_reporting_guidelines, reviewer_whiteboard, license_approved, registrant, remote_product, translation_focus, max_bug_heat, date_next_suggest_packaging, bug_reported_acknowledgement, answers_usage, blueprints_usage, translations_usage, enable_bugfiling_duplicate_search) VALUES (19, NULL, 28, 'aptoncd', 'APTonCD', 'APTonCD, Get APT Anywhere', 'A simple yet powerful tool which allows you to create one (or more) CD/DVD-Repository containing all of the packages downloaded via apt-get or aptitude.', 'A GUI-based tool that allows you to create a CD/DVD with all downloaded packages with APT-GET, creating a removable-repository.
With aptoncd you can:
=== modified file 'database/schema/archive/patch-2207-06-0.sql'
--- database/schema/archive/patch-2207-06-0.sql 2010-08-17 11:25:16 +0000
+++ database/schema/archive/patch-2207-06-0.sql 2011-06-10 08:21:09 +0000
@@ -55,7 +55,7 @@
FROM packagesetgroup WHERE packageset.name = 'lucid-' || packagesetgroup.name;
-- ** PART 3 ** Add the 'packageset.distroseries' foreign key and
--- initialise it for the existing package sets.
+-- initialize it for the existing package sets.
-- A package set lives in a distro series context.
ALTER TABLE ONLY packageset ADD COLUMN distroseries integer;
=== modified file 'database/schema/patch-2208-10-0.sql'
--- database/schema/patch-2208-10-0.sql 2010-09-06 08:13:01 +0000
+++ database/schema/patch-2208-10-0.sql 2011-06-10 08:21:09 +0000
@@ -3,7 +3,7 @@
SET client_min_messages=ERROR;
--- The `InitialiseDistroSeriesJob` table captures the data required for an ifp job.
+-- The `InitializeDistroSeriesJob` table captures the data required for an ifp job.
CREATE TABLE DistributionJob (
id serial PRIMARY KEY,
=== modified file 'database/schema/security.cfg'
--- database/schema/security.cfg 2011-06-06 15:19:37 +0000
+++ database/schema/security.cfg 2011-06-10 08:21:09 +0000
@@ -951,7 +951,7 @@
public.person = SELECT
type=user
-[initialisedistroseries]
+[initializedistroseries]
groups=script
public.archive = SELECT
public.archivepermission = SELECT, INSERT
=== modified file 'lib/canonical/buildd/debian.py'
--- lib/canonical/buildd/debian.py 2010-07-13 09:13:41 +0000
+++ lib/canonical/buildd/debian.py 2011-06-10 08:21:09 +0000
@@ -129,7 +129,7 @@
func(success)
def iterate_INIT(self, success):
- """Just finished initialising the build."""
+ """Just finished initializing the build."""
if success != 0:
if not self.alreadyfailed:
# The init failed, can't fathom why that would be...
=== modified file 'lib/canonical/buildd/slave.py'
--- lib/canonical/buildd/slave.py 2010-09-20 11:52:51 +0000
+++ lib/canonical/buildd/slave.py 2011-06-10 08:21:09 +0000
@@ -556,7 +556,7 @@
self.protocolversion = '1.0'
self.slave = BuildDSlave(config)
self._builders = {}
- print "Initialised"
+ print "Initialized"
def registerBuilder(self, builderclass, buildertag):
self._builders[buildertag] = builderclass
=== modified file 'lib/canonical/config/schema-lazr.conf'
--- lib/canonical/config/schema-lazr.conf 2011-06-09 08:07:52 +0000
+++ lib/canonical/config/schema-lazr.conf 2011-06-10 08:21:09 +0000
@@ -994,9 +994,9 @@
# datatype: int
going_down_status: 500
-[initialisedistroseries]
-dbuser: initialisedistroseries
-source_interface: lp.soyuz.interfaces.distributionjob.IInitialiseDistroSeriesJobSource
+[initializedistroseries]
+dbuser: initializedistroseries
+source_interface: lp.soyuz.interfaces.distributionjob.IInitializeDistroSeriesJobSource
# See [error_reports].
error_dir: none
=== modified file 'lib/canonical/database/ftests/test_zopelesstransactionmanager.txt'
--- lib/canonical/database/ftests/test_zopelesstransactionmanager.txt 2010-03-23 16:32:56 +0000
+++ lib/canonical/database/ftests/test_zopelesstransactionmanager.txt 2011-06-10 08:21:09 +0000
@@ -6,9 +6,9 @@
With the move to Storm, it was converted to a small compatibility shim
used to configure the database adapter.
-== Initialisation ==
+== Initialization ==
-The ZopelessTransactionManager is initialised with the initZopeless()
+The ZopelessTransactionManager is initialized with the initZopeless()
function.
>>> from canonical.lp import initZopeless
=== modified file 'lib/canonical/database/sqlbase.py'
--- lib/canonical/database/sqlbase.py 2011-03-17 11:51:43 +0000
+++ lib/canonical/database/sqlbase.py 2011-06-10 08:21:09 +0000
@@ -184,7 +184,7 @@
correct master Store.
"""
from canonical.launchpad.interfaces.lpstorm import IMasterStore
- # Make it simple to write dumb-invalidators - initialised
+ # Make it simple to write dumb-invalidators - initialized
# _cached_properties to a valid list rather than just-in-time
# creation.
self._cached_properties = []
=== modified file 'lib/canonical/launchpad/testing/fakepackager.py'
--- lib/canonical/launchpad/testing/fakepackager.py 2011-03-03 00:43:44 +0000
+++ lib/canonical/launchpad/testing/fakepackager.py 2011-06-10 08:21:09 +0000
@@ -318,7 +318,7 @@
def buildVersion(self, version, changelog_text="nicht !",
suite='hoary', section=None, arch=None, author='Foo Bar',
email='foo.bar@xxxxxxxxxxxxx', timestamp=None):
- """Initialise a new version of extracted package."""
+ """Initialize a new version of extracted package."""
assert version.startswith(self.version), (
'New versions should start with the upstream version: %s ' % (
self.version))
=== modified file 'lib/lp/archivepublisher/domination.py'
--- lib/lp/archivepublisher/domination.py 2011-04-05 08:33:54 +0000
+++ lib/lp/archivepublisher/domination.py 2011-06-10 08:21:09 +0000
@@ -104,7 +104,7 @@
"""
def __init__(self, logger, archive):
- """Initialise the dominator.
+ """Initialize the dominator.
This process should be run after the publisher has published
new stuff into the distribution but before the publisher
=== modified file 'lib/lp/archivepublisher/publishing.py'
--- lib/lp/archivepublisher/publishing.py 2011-03-29 05:07:23 +0000
+++ lib/lp/archivepublisher/publishing.py 2011-06-10 08:21:09 +0000
@@ -108,7 +108,7 @@
def getPublisher(archive, allowed_suites, log, distsroot=None):
- """Return an initialised Publisher instance for the given context.
+ """Return an initialized Publisher instance for the given context.
The callsites can override the location where the archive indexes will
be stored via 'distroot' argument.
@@ -143,7 +143,7 @@
def __init__(self, log, config, diskpool, archive, allowed_suites=None,
library=None):
- """Initialise a publisher.
+ """Initialize a publisher.
Publishers need the pool root dir and a DiskPool object.
=== modified file 'lib/lp/archiveuploader/nascentupload.py'
--- lib/lp/archiveuploader/nascentupload.py 2011-06-08 11:06:04 +0000
+++ lib/lp/archiveuploader/nascentupload.py 2011-06-10 08:21:09 +0000
@@ -153,7 +153,7 @@
self.run_and_reject_on_error(self.changes.checkFileName)
# We need to process changesfile addresses at this point because
- # we depend on an already initialised policy (distroseries
+ # we depend on an already initialized policy (distroseries
# and pocket set) to have proper person 'creation rationale'.
self.run_and_reject_on_error(self.changes.processAddresses)
@@ -892,7 +892,7 @@
return
# We need to check that the queue_root object has been fully
- # initialised first, because policy checks or even a code exception
+ # initialized first, because policy checks or even a code exception
# may have caused us to bail out early and not create one. If it
# doesn't exist then we can create a dummy one that contains just
# enough context to be able to generate a rejection email. Nothing
=== modified file 'lib/lp/archiveuploader/tests/nascentuploadfile.txt'
--- lib/lp/archiveuploader/tests/nascentuploadfile.txt 2011-05-20 08:04:19 +0000
+++ lib/lp/archiveuploader/tests/nascentuploadfile.txt 2011-06-10 08:21:09 +0000
@@ -221,7 +221,7 @@
>>> sig_file = SignableTagFile()
Note that the policy.{distroseries, pocket} must be already
-initialised before issuing any parse request, otherwise we can't
+initialized before issuing any parse request, otherwise we can't
generate proper PERSON_CREATION_RATIONALE_MESSAGES.
>>> sig_file_policy = getPolicy(name='insecure', distro='ubuntu')
@@ -295,7 +295,7 @@
>>> print addr['email']
foo@xxxxxxxxxxxxx
-If the use an un-initialised policy to create a launchpad person the
+If the use an un-initialized policy to create a launchpad person the
creation_rationale will still be possible, however missing important
information, the upload target:
=== modified file 'lib/lp/archiveuploader/tests/test_uploadprocessor.py'
--- lib/lp/archiveuploader/tests/test_uploadprocessor.py 2011-06-03 10:38:25 +0000
+++ lib/lp/archiveuploader/tests/test_uploadprocessor.py 2011-06-10 08:21:09 +0000
@@ -82,7 +82,7 @@
SourcePackagePublishingHistory,
)
from lp.soyuz.model.sourcepackagerelease import SourcePackageRelease
-from lp.soyuz.scripts.initialise_distroseries import InitialiseDistroSeries
+from lp.soyuz.scripts.initialize_distroseries import InitializeDistroSeries
from lp.testing import (
TestCase,
TestCaseWithFactory,
@@ -209,7 +209,7 @@
def setupBreezy(self, name="breezy", permitted_formats=None):
"""Create a fresh distroseries in ubuntu.
- Use *initialiseFromParent* procedure to create 'breezy'
+ Use *initializeFromParent* procedure to create 'breezy'
on ubuntu based on the last 'breezy-autotest'.
Also sets 'changeslist' and 'nominatedarchindep' properly and
@@ -228,8 +228,8 @@
'5.10', None, bat.owner)
self.breezy.changeslist = 'breezy-changes@xxxxxxxxxx'
- ids = InitialiseDistroSeries(self.breezy, [bat.id])
- ids.initialise()
+ ids = InitializeDistroSeries(self.breezy, [bat.id])
+ ids.initialize()
fake_chroot = self.addMockFile('fake_chroot.tar.gz')
self.breezy['i386'].addOrUpdateChroot(fake_chroot)
=== modified file 'lib/lp/bugs/browser/tests/bugtask-adding-views.txt'
--- lib/lp/bugs/browser/tests/bugtask-adding-views.txt 2011-03-28 20:54:50 +0000
+++ lib/lp/bugs/browser/tests/bugtask-adding-views.txt 2011-06-10 08:21:09 +0000
@@ -365,7 +365,7 @@
bugzilla.somewhere.org/bugs/: 84
The bug watch got linked to the created task, and all the bug task's
-attributes got initialised to Unknown. The bugtask will be synced with
+attributes got initialized to Unknown. The bugtask will be synced with
the bug watch's status later.
>>> alsa_task = bug_four.bugtasks[0]
=== modified file 'lib/lp/bugs/doc/externalbugtracker-rt.txt'
--- lib/lp/bugs/doc/externalbugtracker-rt.txt 2011-05-27 19:53:20 +0000
+++ lib/lp/bugs/doc/externalbugtracker-rt.txt 2011-06-10 08:21:09 +0000
@@ -98,7 +98,7 @@
'Unknown'
-== Initialisation ==
+== Initialization ==
Calling initializeRemoteBugDB() on our RequestTracker instance and
passing it a set of remote bug IDs will fetch those bug IDs from the
=== modified file 'lib/lp/bugs/doc/externalbugtracker-trac.txt'
--- lib/lp/bugs/doc/externalbugtracker-trac.txt 2011-05-27 19:53:20 +0000
+++ lib/lp/bugs/doc/externalbugtracker-trac.txt 2011-06-10 08:21:09 +0000
@@ -182,7 +182,7 @@
>>> sorted(trac.bugs.keys())
[1]
-If we initialise with a different set of keys we overwrite the first set:
+If we initialize with a different set of keys we overwrite the first set:
>>> trac.initializeRemoteBugDB([6,7,8,9,10,11,12])
>>> sorted(trac.bugs.keys())
=== modified file 'lib/lp/bugs/stories/bug-tags/xx-official-bug-tags.txt'
--- lib/lp/bugs/stories/bug-tags/xx-official-bug-tags.txt 2011-03-17 03:03:33 +0000
+++ lib/lp/bugs/stories/bug-tags/xx-official-bug-tags.txt 2011-06-10 08:21:09 +0000
@@ -218,7 +218,7 @@
=== Available Official Tags in Javascript ===
The list of available official tags is present on the page as a Javascript
-variable. This list is used to initialise the tag entry widget. The list
+variable. This list is used to initialize the tag entry widget. The list
comprises of the official tags of all targets for which the bug has a task.
>>> login('foo.bar@xxxxxxxxxxxxx')
=== modified file 'lib/lp/buildmaster/doc/buildqueue.txt'
--- lib/lp/buildmaster/doc/buildqueue.txt 2010-10-09 16:36:22 +0000
+++ lib/lp/buildmaster/doc/buildqueue.txt 2011-06-10 08:21:09 +0000
@@ -4,7 +4,7 @@
processed.
See buildd-queuebuilder.txt for more information about the BuildQueue
-initialisation.
+initialization.
BuildQueue should provide all the information needed for dispatching
and collecting build results.
@@ -38,7 +38,7 @@
>>> build.status.name
'BUILDING'
-The static timestamps, representing when the record was initialised
+The static timestamps, representing when the record was initialized
(inserted) and when the job was dispatched are provided as datetime
instances:
=== modified file 'lib/lp/buildmaster/model/buildfarmjobbehavior.py'
--- lib/lp/buildmaster/model/buildfarmjobbehavior.py 2011-02-17 18:29:23 +0000
+++ lib/lp/buildmaster/model/buildfarmjobbehavior.py 2011-06-10 08:21:09 +0000
@@ -36,7 +36,7 @@
class BuildFarmJobBehaviorBase:
- """Ensures that all behaviors inherit the same initialisation.
+ """Ensures that all behaviors inherit the same initialization.
All build-farm job behaviors should inherit from this.
"""
@@ -201,7 +201,7 @@
def __init__(self):
"""The idle behavior is special in that a buildfarmjob is not
- specified during initialisation as it is not the result of an
+ specified during initialization as it is not the result of an
adaption.
"""
super(IdleBuildBehavior, self).__init__(None)
=== modified file 'lib/lp/buildmaster/tests/mock_slaves.py'
--- lib/lp/buildmaster/tests/mock_slaves.py 2011-03-29 13:57:20 +0000
+++ lib/lp/buildmaster/tests/mock_slaves.py 2011-06-10 08:21:09 +0000
@@ -109,7 +109,7 @@
class OkSlave:
"""An idle mock slave that prints information about itself.
- The architecture tag can be customised during initialisation."""
+ The architecture tag can be customised during initialization."""
def __init__(self, arch_tag=I386_ARCHITECTURE_NAME):
self.call_log = []
=== modified file 'lib/lp/buildmaster/tests/test_builder.py'
--- lib/lp/buildmaster/tests/test_builder.py 2011-02-01 17:48:22 +0000
+++ lib/lp/buildmaster/tests/test_builder.py 2011-06-10 08:21:09 +0000
@@ -103,7 +103,7 @@
def test_default_values(self):
builder = self.factory.makeBuilder()
# Make sure the Storm cache gets the values that the database
- # initialises.
+ # initializes.
flush_database_updates()
self.assertEqual(0, builder.failure_count)
=== modified file 'lib/lp/buildmaster/tests/test_manager.py'
--- lib/lp/buildmaster/tests/test_manager.py 2011-02-14 14:55:06 +0000
+++ lib/lp/buildmaster/tests/test_manager.py 2011-06-10 08:21:09 +0000
@@ -521,7 +521,7 @@
return NewBuildersScanner(manager=manager, clock=clock)
def test_init_stores_existing_builders(self):
- # Make sure that NewBuildersScanner initialises itself properly
+ # Make sure that NewBuildersScanner initializes itself properly
# by storing a list of existing builders.
all_builders = [builder.name for builder in getUtility(IBuilderSet)]
builder_scanner = self._getScanner()
=== modified file 'lib/lp/codehosting/codeimport/worker.py'
--- lib/lp/codehosting/codeimport/worker.py 2011-06-01 15:59:45 +0000
+++ lib/lp/codehosting/codeimport/worker.py 2011-06-10 08:21:09 +0000
@@ -500,7 +500,7 @@
last_commit = cscvs.findLastCscvsCommit(scm_branch)
# If branch in `bazaar_tree` doesn't have any identifiable CSCVS
- # revisions, CSCVS "initialises" the branch.
+ # revisions, CSCVS "initializes" the branch.
if last_commit is None:
self._runToBaz(
foreign_directory, "-SI", "MAIN.1", bzr_directory)
=== modified file 'lib/lp/registry/browser/tests/test_distroseries.py'
--- lib/lp/registry/browser/tests/test_distroseries.py 2011-06-09 10:34:37 +0000
+++ lib/lp/registry/browser/tests/test_distroseries.py 2011-06-10 08:21:09 +0000
@@ -67,7 +67,7 @@
from lp.soyuz.interfaces.component import IComponentSet
from lp.soyuz.interfaces.distributionjob import (
IDistroSeriesDifferenceJobSource,
- IInitialiseDistroSeriesJobSource,
+ IInitializeDistroSeriesJobSource,
)
from lp.soyuz.interfaces.packagecopyjob import IPlainPackageCopyJobSource
from lp.soyuz.interfaces.sourcepackageformat import (
@@ -296,22 +296,22 @@
self.assertThat(html_content, portlet_display)
- def test_differences_portlet_initialising(self):
- # The difference portlet displays 'The series is initialising.' if
- # there is an initialising job for the series.
+ def test_differences_portlet_initializing(self):
+ # The difference portlet displays 'The series is initializing.' if
+ # there is an initializing job for the series.
set_derived_series_ui_feature_flag(self)
derived_series = self.factory.makeDistroSeries()
parent_series = self.factory.makeDistroSeries()
self.simple_user = self.factory.makePerson()
- job_source = getUtility(IInitialiseDistroSeriesJobSource)
+ job_source = getUtility(IInitializeDistroSeriesJobSource)
job_source.create(derived_series, [parent_series.id])
portlet_display = soupmatchers.HTMLContains(
soupmatchers.Tag(
'Derived series', 'h2',
- text='Series initialisation in progress'),
+ text='Series initialization in progress'),
soupmatchers.Tag(
'Init message', True,
- text=re.compile('\s*This series is initialising.\s*')),
+ text=re.compile('\s*This series is initializing.\s*')),
)
with person_logged_in(self.simple_user):
@@ -324,7 +324,7 @@
view.request.features = get_relevant_feature_controller()
html_content = view()
- self.assertTrue(derived_series.is_initialising)
+ self.assertTrue(derived_series.is_initializing)
self.assertThat(html_content, portlet_display)
=== modified file 'lib/lp/registry/doc/distroseries.txt'
--- lib/lp/registry/doc/distroseries.txt 2011-05-31 14:07:54 +0000
+++ lib/lp/registry/doc/distroseries.txt 2011-06-10 08:21:09 +0000
@@ -294,12 +294,12 @@
partner
-DistroSeries can be initialised from their parents
+DistroSeries can be initialized from their parents
--------------------------------------------------
When a distroseries is derived from another distroseries (be it a
derivative distribution, or simply the next release in a sequence from
-Ubuntu) we need to initialise the new release with quite a lot of
+Ubuntu) we need to initialize the new release with quite a lot of
information. Not least of which is the section and component
selections and the publishing information for the distroseries.
@@ -308,18 +308,18 @@
thousands of rows around in order to set up a distroseries.
IDistroSeries lists a series of preconditions for performing an
-initialisation. In particular the initialiser won't overwrite
+initialization. In particular the initializer won't overwrite
publishing records etc. Essentially this is a "Do not push this button
again" type set of assertions.
- >>> from lp.soyuz.scripts.initialise_distroseries import (
- ... InitialiseDistroSeries)
+ >>> from lp.soyuz.scripts.initialize_distroseries import (
+ ... InitializeDistroSeries)
>>> login("foo.bar@xxxxxxxxxxxxx")
>>> humpy = ubuntu.newSeries('humpy', 'Humpy Hippo',
... 'The Humpy Hippo', 'Fat', 'Yo Momma',
... '99.2', None, hoary.owner)
- >>> ids = InitialiseDistroSeries(humpy, [hoary.id])
- >>> ids.initialise()
+ >>> ids = InitializeDistroSeries(humpy, [hoary.id])
+ >>> ids.initialize()
>>> hoary.getPublishedSources('pmount').count()
1
>>> humpy.getPublishedSources('pmount').count()
@@ -329,12 +329,12 @@
>>> len(humpy['i386'].getReleasedPackages('pmount'))
1
-Check if the attributes of an DRSPR instance for the just initialised
+Check if the attributes of an DRSPR instance for the just initialized
distroseries are sane. A DRSPR instance should filter attributes of
a SPR according the distroseries in question (practically according
what is published in this distrorelelase)
-Since the initialise-from-parent procedure copies the latest
+Since the initialize-from-parent procedure copies the latest
publications from the parent IDRSPR.builds should be empty, reflecting
that there are no builds for this SPR in this DistroSeries.
IDRSPR.builds will be non-empty after a developer submits a new SPR
@@ -346,14 +346,14 @@
resulted of the sourcepackagerelease in question, but built anywhere.
(fix bug #52938)
-Initialise a new distroseries based on warty (since it has, at least
+Initialize a new distroseries based on warty (since it has, at least
one coherent published source + binary, mozilla-firefox)
>>> bumpy = ubuntu.newSeries('bumpy', 'Bumpy',
... 'The Bumpy', 'Fat', 'Boom',
... '99.3', None, warty.owner)
- >>> ids = InitialiseDistroSeries(bumpy, [warty.id])
- >>> ids.initialise()
+ >>> ids = InitializeDistroSeries(bumpy, [warty.id])
+ >>> ids.initialize()
Build a new ISourcePackage based in the new distroseries:
=== modified file 'lib/lp/registry/interfaces/distroseries.py'
--- lib/lp/registry/interfaces/distroseries.py 2011-06-08 11:06:04 +0000
+++ lib/lp/registry/interfaces/distroseries.py 2011-06-10 08:21:09 +0000
@@ -239,9 +239,9 @@
is_derived_series = Bool(
title=u'Is this series a derived series?', readonly=True,
description=(u"Whether or not this series is a derived series."))
- is_initialising = Bool(
- title=u'Is this series initialising?', readonly=True,
- description=(u"Whether or not this series is initialising."))
+ is_initializing = Bool(
+ title=u'Is this series initializing?', readonly=True,
+ description=(u"Whether or not this series is initializing."))
datereleased = exported(
Datetime(title=_("Date released")))
previous_series = exported(
=== modified file 'lib/lp/registry/javascript/distroseries.js'
--- lib/lp/registry/javascript/distroseries.js 2011-06-06 08:51:09 +0000
+++ lib/lp/registry/javascript/distroseries.js 2011-06-10 08:21:09 +0000
@@ -1023,7 +1023,7 @@
},
/**
- * Initialise the picker's select node.
+ * Initialize the picker's select node.
*
* @method init_select
*/
=== modified file 'lib/lp/registry/model/distroseries.py'
--- lib/lp/registry/model/distroseries.py 2011-06-08 15:27:40 +0000
+++ lib/lp/registry/model/distroseries.py 2011-06-10 08:21:09 +0000
@@ -140,7 +140,7 @@
from lp.soyuz.interfaces.binarypackagename import IBinaryPackageName
from lp.soyuz.interfaces.buildrecords import IHasBuildRecords
from lp.soyuz.interfaces.distributionjob import (
- IInitialiseDistroSeriesJobSource,
+ IInitializeDistroSeriesJobSource,
)
from lp.soyuz.interfaces.publishing import (
active_publishing_status,
@@ -176,9 +176,9 @@
)
from lp.soyuz.model.section import Section
from lp.soyuz.model.sourcepackagerelease import SourcePackageRelease
-from lp.soyuz.scripts.initialise_distroseries import (
- InitialisationError,
- InitialiseDistroSeries,
+from lp.soyuz.scripts.initialize_distroseries import (
+ InitializationError,
+ InitializeDistroSeries,
)
from lp.translations.enums import LanguagePackType
from lp.translations.model.distroseries_translations_copy import (
@@ -802,10 +802,10 @@
return not self.getParentSeries() == []
@property
- def is_initialising(self):
+ def is_initializing(self):
"""See `IDistroSeries`."""
return not getUtility(
- IInitialiseDistroSeriesJobSource).getPendingJobsForDistroseries(
+ IInitializeDistroSeriesJobSource).getPendingJobsForDistroseries(
self).is_empty()
@property
@@ -1978,12 +1978,12 @@
if self.is_derived_series:
raise DerivationError(
"DistroSeries %s already has parent series." % self.name)
- initialise_series = InitialiseDistroSeries(self, parents)
+ initialize_series = InitializeDistroSeries(self, parents)
try:
- initialise_series.check()
- except InitialisationError, e:
+ initialize_series.check()
+ except InitializationError, e:
raise DerivationError(e)
- getUtility(IInitialiseDistroSeriesJobSource).create(
+ getUtility(IInitializeDistroSeriesJobSource).create(
self, parents, architectures, packagesets, rebuild, overlays,
overlay_pockets, overlay_components)
=== modified file 'lib/lp/registry/stories/webservice/xx-derivedistroseries.txt'
--- lib/lp/registry/stories/webservice/xx-derivedistroseries.txt 2011-05-31 14:07:54 +0000
+++ lib/lp/registry/stories/webservice/xx-derivedistroseries.txt 2011-06-10 08:21:09 +0000
@@ -79,10 +79,10 @@
>>> from zope.component import getUtility
>>> from lp.soyuz.interfaces.distributionjob import (
- ... IInitialiseDistroSeriesJobSource)
+ ... IInitializeDistroSeriesJobSource)
>>> login(ADMIN_EMAIL)
>>> jobs = sorted(
- ... getUtility(IInitialiseDistroSeriesJobSource).iterReady(),
+ ... getUtility(IInitializeDistroSeriesJobSource).iterReady(),
... key=lambda x: x.distroseries.name)
>>> for job in jobs:
... print job.distroseries.name
=== modified file 'lib/lp/registry/templates/distroseries-index.pt'
--- lib/lp/registry/templates/distroseries-index.pt 2011-05-24 10:08:33 +0000
+++ lib/lp/registry/templates/distroseries-index.pt 2011-06-10 08:21:09 +0000
@@ -68,7 +68,7 @@
<tal:derivation
tal:condition="request/features/soyuz.derived_series_ui.enabled">
<div class="yui-u"
- tal:condition="python:context.is_derived_series or context.is_initialising">
+ tal:condition="python:context.is_derived_series or context.is_initializing">
<div tal:replace="structure context/@@+portlet-derivation" />
</div>
</tal:derivation>
=== modified file 'lib/lp/registry/templates/distroseries-portlet-derivation.pt'
--- lib/lp/registry/templates/distroseries-portlet-derivation.pt 2011-05-31 11:55:38 +0000
+++ lib/lp/registry/templates/distroseries-portlet-derivation.pt 2011-06-10 08:21:09 +0000
@@ -5,7 +5,7 @@
id="series-derivation" class="portlet"
tal:define="overview_menu context/menu:overview">
<tal:is_derived condition="context/is_derived_series">
- <tal:is_initialised condition="not: context/is_initialising">
+ <tal:is_initialized condition="not: context/is_initializing">
<tal:one_parent condition="view/has_unique_parent">
<h2>Derived from <tal:name replace="view/unique_parent/displayname"/></h2>
</tal:one_parent>
@@ -59,10 +59,10 @@
No differences.
</tal:no_diffs>
</tal:diffs>
- </tal:is_initialised>
+ </tal:is_initialized>
</tal:is_derived>
- <tal:is_initialising condition="context/is_initialising">
- <h2>Series initialisation in progress</h2>
- This series is initialising.
- </tal:is_initialising>
+ <tal:is_initializing condition="context/is_initializing">
+ <h2>Series initialization in progress</h2>
+ This series is initializing.
+ </tal:is_initializing>
</div>
=== modified file 'lib/lp/registry/tests/test_distroseries.py'
--- lib/lp/registry/tests/test_distroseries.py 2011-05-31 15:40:10 +0000
+++ lib/lp/registry/tests/test_distroseries.py 2011-06-10 08:21:09 +0000
@@ -27,7 +27,7 @@
from lp.soyuz.interfaces.archive import IArchiveSet
from lp.soyuz.interfaces.component import IComponentSet
from lp.soyuz.interfaces.distributionjob import (
- IInitialiseDistroSeriesJobSource,
+ IInitializeDistroSeriesJobSource,
)
from lp.soyuz.interfaces.distroseriessourcepackagerelease import (
IDistroSeriesSourcePackageRelease,
@@ -222,22 +222,22 @@
self.assertEquals(registrant, distroseries.registrant)
self.assertNotEqual(distroseries.registrant, distroseries.owner)
- def test_is_initialising(self):
- # The series is_initialising only if there is an initialisation
+ def test_is_initializing(self):
+ # The series is_initializing only if there is an initialization
# job with a pending status attached to this series.
distroseries = self.factory.makeDistroSeries()
parent_distroseries = self.factory.makeDistroSeries()
- self.assertEquals(False, distroseries.is_initialising)
- job_source = getUtility(IInitialiseDistroSeriesJobSource)
+ self.assertEquals(False, distroseries.is_initializing)
+ job_source = getUtility(IInitializeDistroSeriesJobSource)
job = job_source.create(distroseries, [parent_distroseries.id])
- self.assertEquals(True, distroseries.is_initialising)
+ self.assertEquals(True, distroseries.is_initializing)
job.start()
- self.assertEquals(True, distroseries.is_initialising)
+ self.assertEquals(True, distroseries.is_initializing)
job.queue()
- self.assertEquals(True, distroseries.is_initialising)
+ self.assertEquals(True, distroseries.is_initializing)
job.start()
job.complete()
- self.assertEquals(False, distroseries.is_initialising)
+ self.assertEquals(False, distroseries.is_initializing)
class TestDistroSeriesPackaging(TestCaseWithFactory):
=== modified file 'lib/lp/registry/tests/test_initderiveddistroseries.py'
--- lib/lp/registry/tests/test_initderiveddistroseries.py 2011-05-30 19:35:09 +0000
+++ lib/lp/registry/tests/test_initderiveddistroseries.py 2011-06-10 08:21:09 +0000
@@ -1,7 +1,7 @@
# Copyright 2010 Canonical Ltd. This software is licensed under the
# GNU Affero General Public License version 3 (see the file LICENSE).
-"""Test initialising a distroseries using
+"""Test initializing a distroseries using
IDistroSeries.initDerivedDistroSeries."""
__metaclass__ = type
@@ -13,7 +13,7 @@
from canonical.testing.layers import LaunchpadFunctionalLayer
from lp.registry.interfaces.distroseries import DerivationError
from lp.soyuz.interfaces.distributionjob import (
- IInitialiseDistroSeriesJobSource,
+ IInitializeDistroSeriesJobSource,
)
from lp.testing import (
ANONYMOUS,
@@ -56,5 +56,5 @@
self.child.initDerivedDistroSeries(
self.child.driver, [self.parent.id])
[job] = list(
- getUtility(IInitialiseDistroSeriesJobSource).iterReady())
+ getUtility(IInitializeDistroSeriesJobSource).iterReady())
self.assertEqual(job.distroseries, self.child)
=== modified file 'lib/lp/registry/tests/test_prf_filter.py'
--- lib/lp/registry/tests/test_prf_filter.py 2009-06-25 04:06:00 +0000
+++ lib/lp/registry/tests/test_prf_filter.py 2011-06-10 08:21:09 +0000
@@ -27,7 +27,7 @@
class Filter_Init(unittest.TestCase):
def testDefaultFiltersProperty(self):
- """Filter constructor initialises filters property to empty dict."""
+ """Filter constructor initializes filters property to empty dict."""
from lp.registry.scripts.productreleasefinder.filter import (
Filter)
f = Filter()
=== modified file 'lib/lp/registry/tests/test_prf_walker.py'
--- lib/lp/registry/tests/test_prf_walker.py 2011-02-12 00:00:34 +0000
+++ lib/lp/registry/tests/test_prf_walker.py 2011-06-10 08:21:09 +0000
@@ -199,7 +199,7 @@
class FTPWalker_Base(TestCase):
def testFtpScheme(self):
- """FTPWalker works when initialised with an ftp-scheme URL."""
+ """FTPWalker works when initialized with an ftp-scheme URL."""
from lp.registry.scripts.productreleasefinder.walker import (
FTPWalker)
w = FTPWalker("ftp://localhost/";)
@@ -236,14 +236,14 @@
class HTTPWalker_Base(TestCase):
def testHttpScheme(self):
- """HTTPWalker works when initialised with an http-scheme URL."""
+ """HTTPWalker works when initialized with an http-scheme URL."""
from lp.registry.scripts.productreleasefinder.walker import (
HTTPWalker)
w = HTTPWalker("http://localhost/";)
self.assertEquals(w.host, "localhost")
def testHttpsScheme(self):
- """HTTPWalker works when initialised with an https-scheme URL."""
+ """HTTPWalker works when initialized with an https-scheme URL."""
from lp.registry.scripts.productreleasefinder.walker import (
HTTPWalker)
w = HTTPWalker("https://localhost/";)
=== modified file 'lib/lp/services/googlesearch/doc/google-searchservice.txt'
--- lib/lp/services/googlesearch/doc/google-searchservice.txt 2011-03-07 16:32:12 +0000
+++ lib/lp/services/googlesearch/doc/google-searchservice.txt 2011-06-10 08:21:09 +0000
@@ -133,7 +133,7 @@
True
The title and summary attributes contain the same text that
-initialised the object.
+initialized the object.
>>> page_match.title
u'Unicode Titles in Launchpad'
=== modified file 'lib/lp/soyuz/configure.zcml'
--- lib/lp/soyuz/configure.zcml 2011-06-03 08:53:14 +0000
+++ lib/lp/soyuz/configure.zcml 2011-06-10 08:21:09 +0000
@@ -886,14 +886,14 @@
<allow interface="lp.soyuz.interfaces.distributionjob.IDistributionJob" />
</class>
- <!-- InitialiseDistroSeriesJobSource -->
+ <!-- InitializeDistroSeriesJobSource -->
<securedutility
- component="lp.soyuz.model.initialisedistroseriesjob.InitialiseDistroSeriesJob"
- provides="lp.soyuz.interfaces.distributionjob.IInitialiseDistroSeriesJobSource">
- <allow interface="lp.soyuz.interfaces.distributionjob.IInitialiseDistroSeriesJobSource"/>
+ component="lp.soyuz.model.initializedistroseriesjob.InitializeDistroSeriesJob"
+ provides="lp.soyuz.interfaces.distributionjob.IInitializeDistroSeriesJobSource">
+ <allow interface="lp.soyuz.interfaces.distributionjob.IInitializeDistroSeriesJobSource"/>
</securedutility>
- <class class="lp.soyuz.model.initialisedistroseriesjob.InitialiseDistroSeriesJob">
- <allow interface="lp.soyuz.interfaces.distributionjob.IInitialiseDistroSeriesJob" />
+ <class class="lp.soyuz.model.initializedistroseriesjob.InitializeDistroSeriesJob">
+ <allow interface="lp.soyuz.interfaces.distributionjob.IInitializeDistroSeriesJob" />
<allow interface="lp.soyuz.interfaces.distributionjob.IDistributionJob" />
</class>
=== modified file 'lib/lp/soyuz/doc/archive-override-check.txt'
--- lib/lp/soyuz/doc/archive-override-check.txt 2010-12-03 18:28:03 +0000
+++ lib/lp/soyuz/doc/archive-override-check.txt 2011-06-10 08:21:09 +0000
@@ -32,7 +32,7 @@
0
>>> print stderr
DEBUG Acquiring lock
- DEBUG Initialising connection.
+ DEBUG Initializing connection.
DEBUG Considering: ubuntu/warty/RELEASE/CURRENT.
DEBUG ... published sources
DEBUG Rolling back any remaining transactions.
=== modified file 'lib/lp/soyuz/doc/buildd-mass-retry.txt'
--- lib/lp/soyuz/doc/buildd-mass-retry.txt 2011-05-04 02:45:25 +0000
+++ lib/lp/soyuz/doc/buildd-mass-retry.txt 2011-06-10 08:21:09 +0000
@@ -38,7 +38,7 @@
0
>>> print stderr
DEBUG Intitialising connection.
- INFO Initialising Build Mass-Retry for 'The Hoary Hedgehog Release/RELEASE'
+ INFO Initializing Build Mass-Retry for 'The Hoary Hedgehog Release/RELEASE'
INFO Processing builds in 'Failed to build'
INFO Processing builds in 'Dependency wait'
INFO Retrying i386 build of libstdc++ b8p in ubuntu hoary RELEASE (12)
@@ -75,7 +75,7 @@
0
>>> print stderr
DEBUG Intitialising connection.
- INFO Initialising Build Mass-Retry for 'The Hoary Hedgehog Release/RELEASE'
+ INFO Initializing Build Mass-Retry for 'The Hoary Hedgehog Release/RELEASE'
INFO Processing builds in 'Failed to build'
INFO Processing builds in 'Dependency wait'
DEBUG Skipping superseded i386 build of libstdc++ b8p in ubuntu hoary RELEASE (12)
@@ -99,7 +99,7 @@
0
>>> print stderr
DEBUG Intitialising connection.
- INFO Initialising Build Mass-Retry for 'The Hoary Hedgehog Release for hppa (hppa)/RELEASE'
+ INFO Initializing Build Mass-Retry for 'The Hoary Hedgehog Release for hppa (hppa)/RELEASE'
INFO Processing builds in 'Failed to build'
INFO Processing builds in 'Dependency wait'
INFO Processing builds in 'Chroot problem'
@@ -119,7 +119,7 @@
0
>>> print stderr
DEBUG Intitialising connection.
- INFO Initialising Build Mass-Retry for 'The Hoary Hedgehog Release/RELEASE'
+ INFO Initializing Build Mass-Retry for 'The Hoary Hedgehog Release/RELEASE'
INFO Processing builds in 'Failed to build'
INFO Success.
INFO Dry-run.
=== modified file 'lib/lp/soyuz/doc/distroseriesqueue-ddtp-tarball.txt'
--- lib/lp/soyuz/doc/distroseriesqueue-ddtp-tarball.txt 2011-05-27 06:17:14 +0000
+++ lib/lp/soyuz/doc/distroseriesqueue-ddtp-tarball.txt 2011-06-10 08:21:09 +0000
@@ -151,7 +151,7 @@
>>> process.returncode
0
>>> print stdout
- Initialising connection to queue accepted
+ Initializing connection to queue accepted
Running: "fetch trans"
Fetching ubuntutest/breezy-autotest (ACCEPTED) 1/1
---------------------------------------------------------------------------
=== modified file 'lib/lp/soyuz/doc/distroseriesqueue-dist-upgrader.txt'
--- lib/lp/soyuz/doc/distroseriesqueue-dist-upgrader.txt 2011-05-27 19:53:20 +0000
+++ lib/lp/soyuz/doc/distroseriesqueue-dist-upgrader.txt 2011-06-10 08:21:09 +0000
@@ -101,7 +101,7 @@
>>> process.returncode
0
>>> print stdout
- Initialising connection to queue accepted
+ Initializing connection to queue accepted
...
Rejecting dist-upgrader_20060302.0120_all.tar.gz
...
@@ -119,7 +119,7 @@
>>> process.returncode
0
>>> print stdout
- Initialising connection to queue rejected
+ Initializing connection to queue rejected
...
Accepting dist-upgrader_20060302.0120_all.tar.gz
...
@@ -135,7 +135,7 @@
>>> process.returncode
0
>>> print stdout
- Initialising connection to queue accepted
+ Initializing connection to queue accepted
Running: "fetch dist"
Fetching ubuntutest/breezy-autotest (ACCEPTED) 1/1
---------------------------------------------------------------------------
=== modified file 'lib/lp/soyuz/doc/fakepackager.txt'
--- lib/lp/soyuz/doc/fakepackager.txt 2010-10-18 22:24:59 +0000
+++ lib/lp/soyuz/doc/fakepackager.txt 2011-06-10 08:21:09 +0000
@@ -9,7 +9,7 @@
== Setup and reset ==
-When FakePackager is initialised it automatically creates a temporary
+When FakePackager is initialized it automatically creates a temporary
directory we call 'sandbox'. It's where the packages will get created.
>>> packager = FakePackager('biscuit', '1.0')
@@ -21,7 +21,7 @@
True
Source 'name' and 'version' and 'gpg_key_id' are set according the
-give arguments passed in the initialisation.
+give arguments passed in the initialization.
>>> print packager.name
biscuit
@@ -127,7 +127,7 @@
>>> print packager.gpg_key_id
None
-A GPG key can only be set on initialisation so we will have to create a
+A GPG key can only be set on initialization so we will have to create a
new packager passing a filename available in our test_keys directory
(see launchpad/ftests/keys_for_tests.py)
=== modified file 'lib/lp/soyuz/doc/ftpmaster-tools.txt'
--- lib/lp/soyuz/doc/ftpmaster-tools.txt 2009-04-28 12:59:43 +0000
+++ lib/lp/soyuz/doc/ftpmaster-tools.txt 2011-06-10 08:21:09 +0000
@@ -29,7 +29,7 @@
>>> process.returncode
0
>>> print stdout
- Initialising connection to queue new
+ Initializing connection to queue new
Running: "info"
Listing ubuntu/breezy-autotest (NEW) 6/6
---------|----|----------------------|----------------------|---------------
@@ -59,7 +59,7 @@
>>> process.returncode
0
>>> print stdout
- Initialising connection to queue unapproved
+ Initializing connection to queue unapproved
Running: "info"
Listing ubuntu/breezy-autotest-updates (UNAPPROVED) 1/1
---------|----|----------------------|----------------------|---------------
=== modified file 'lib/lp/soyuz/doc/manage-chroot.txt'
--- lib/lp/soyuz/doc/manage-chroot.txt 2010-12-22 20:46:21 +0000
+++ lib/lp/soyuz/doc/manage-chroot.txt 2011-06-10 08:21:09 +0000
@@ -69,7 +69,7 @@
0
>>> print stderr
INFO Creating lockfile: /var/lock/launchpad-mangage-chroot.lock
- DEBUG Initialising ChrootManager for 'The Hoary Hedgehog Release for i386 (x86)'
+ DEBUG Initializing ChrootManager for 'The Hoary Hedgehog Release for i386 (x86)'
DEBUG LibraryFileAlias: ..., 25 bytes, 04a60337a417012f7c51fb56d59d2d0d
DEBUG PocketChroot for 'The Hoary Hedgehog Release for i386 (x86)' (1) added.
INFO Transaction committed.
@@ -88,7 +88,7 @@
... print info
... else:
... print "Did not get expected exception"
- DEBUG Initialising ChrootManager for 'The Hoary Hedgehog Release for i386 (x86)'
+ DEBUG Initializing ChrootManager for 'The Hoary Hedgehog Release for i386 (x86)'
ERROR Allowed actions: ['add', 'update', 'remove', 'get']
Unknown action: bogus
@@ -108,7 +108,7 @@
>>> manage_chroot = getScriptObject("update")
>>> manage_chroot.mainTask()
- DEBUG Initialising ChrootManager for 'The Hoary Hedgehog Release for i386 (x86)'
+ DEBUG Initializing ChrootManager for 'The Hoary Hedgehog Release for i386 (x86)'
DEBUG LibraryFileAlias: ..., 25 bytes, 04a60337a417012f7c51fb56d59d2d0d
DEBUG PocketChroot for 'The Hoary Hedgehog Release for i386 (x86)' (1) updated.
@@ -127,7 +127,7 @@
... print info
... else:
... print "Did not get expected exception"
- DEBUG Initialising ChrootManager for 'The Hoary Hedgehog Release for i386 (x86)'
+ DEBUG Initializing ChrootManager for 'The Hoary Hedgehog Release for i386 (x86)'
Could not open: ...no-such-file
Commit the work done so far so the librarian has the uploaded file.
@@ -142,7 +142,7 @@
>>> manage_chroot = getScriptObject("get", filepath=filepath)
>>> manage_chroot.mainTask()
- DEBUG Initialising ChrootManager for 'The Hoary Hedgehog Release for i386 (x86)'
+ DEBUG Initializing ChrootManager for 'The Hoary Hedgehog Release for i386 (x86)'
DEBUG PocketChroot for 'The Hoary Hedgehog Release for i386 (x86)' (1) retrieved.
DEBUG Writing to '...foo'.
@@ -159,7 +159,7 @@
>>> manage_chroot = getScriptObject("remove")
>>> manage_chroot.mainTask()
- DEBUG Initialising ChrootManager for 'The Hoary Hedgehog Release for i386 (x86)'
+ DEBUG Initializing ChrootManager for 'The Hoary Hedgehog Release for i386 (x86)'
DEBUG PocketChroot for 'The Hoary Hedgehog Release for i386 (x86)' (1) retrieved.
DEBUG PocketChroot for 'The Hoary Hedgehog Release for i386 (x86)' (1) removed.
@@ -173,7 +173,7 @@
... print info
... else:
... print "Did not get expected exception"
- DEBUG Initialising ChrootManager for 'The Hoary Hedgehog Release for i386 (x86)'
+ DEBUG Initializing ChrootManager for 'The Hoary Hedgehog Release for i386 (x86)'
Chroot was deleted.
>>> os.remove(filepath)
@@ -192,7 +192,7 @@
... print info
... else:
... print "Did not get expected exception"
- DEBUG Initialising ChrootManager for 'The Hoary Hedgehog Release for i386 (x86)'
+ DEBUG Initializing ChrootManager for 'The Hoary Hedgehog Release for i386 (x86)'
Librarian upload failed: ...Connection refused...
>>> LibrarianLayer.reveal()
=== modified file 'lib/lp/soyuz/doc/publishing.txt'
--- lib/lp/soyuz/doc/publishing.txt 2011-05-17 12:49:10 +0000
+++ lib/lp/soyuz/doc/publishing.txt 2011-06-10 08:21:09 +0000
@@ -1506,7 +1506,7 @@
pmount 0.1-1 in warty
pqr 666 in breezy-autotest
-We use the source publications to initialise
+We use the source publications to initialize
`ArchiveSourcePublications`.
>>> decorated_set = ArchiveSourcePublications(cprov_published_sources)
=== modified file 'lib/lp/soyuz/doc/soyuz-set-of-uploads.txt'
--- lib/lp/soyuz/doc/soyuz-set-of-uploads.txt 2011-06-07 23:33:42 +0000
+++ lib/lp/soyuz/doc/soyuz-set-of-uploads.txt 2011-06-10 08:21:09 +0000
@@ -73,8 +73,8 @@
>>> from lp.registry.interfaces.pocket import PackagePublishingPocket
>>> from lp.registry.model.distribution import Distribution
>>> from lp.soyuz.enums import PackageUploadStatus
- >>> from lp.soyuz.scripts.initialise_distroseries import (
- ... InitialiseDistroSeries)
+ >>> from lp.soyuz.scripts.initialize_distroseries import (
+ ... InitializeDistroSeries)
>>> from canonical.launchpad.database.librarian import LibraryFileAlias
>>> ubuntu = Distribution.byName('ubuntu')
>>> breezy_autotest = ubuntu['breezy-autotest']
@@ -83,8 +83,8 @@
... 'breezy', 'Breezy Badger', 'The Breezy Badger',
... 'Black and White', 'Someone', '5.10', None,
... breezy_autotest.owner)
- >>> ids = InitialiseDistroSeries(breezy, [breezy_autotest.id])
- >>> ids.initialise()
+ >>> ids = InitializeDistroSeries(breezy, [breezy_autotest.id])
+ >>> ids.initialize()
>>> breezy.changeslist = 'breezy-changes@xxxxxxxxxx'
>>> fake_chroot = LibraryFileAlias.get(1)
>>> unused = breezy['i386'].addOrUpdateChroot(fake_chroot)
@@ -429,7 +429,7 @@
>>> simulate_upload(
... 'foo_1.0-1', upload_policy='sync', is_new=True,
... loglevel=logging.DEBUG)
- DEBUG Initialising connection.
+ DEBUG Initializing connection.
...
DEBUG Sent a mail:
DEBUG Subject: [ubuntutest/breezy] foo 1.0-1 (New)
@@ -486,7 +486,7 @@
>>> simulate_upload(
... 'foo_2.9-1', upload_policy='sync', loglevel=logging.DEBUG)
- DEBUG Initialising connection.
+ DEBUG Initializing connection.
...
DEBUG Setting it to ACCEPTED
...
@@ -526,7 +526,7 @@
>>> simulate_upload(
... 'foo_2.9-2', upload_policy='sync', loglevel=logging.DEBUG)
- DEBUG Initialising connection.
+ DEBUG Initializing connection.
...
DEBUG Setting it to ACCEPTED
...
@@ -538,7 +538,7 @@
>>> simulate_upload(
... 'foo_2.9-4', upload_policy='sync', loglevel=logging.DEBUG)
- DEBUG Initialising connection.
+ DEBUG Initializing connection.
...
DEBUG Setting it to ACCEPTED
...
@@ -546,7 +546,7 @@
>>> simulate_upload(
... 'foo_2.9-3', upload_policy='sync', loglevel=logging.DEBUG)
- DEBUG Initialising connection.
+ DEBUG Initializing connection.
...
DEBUG Setting it to ACCEPTED
...
@@ -696,7 +696,7 @@
>>> fillLibrarianFile(70)
>>> run_publish_distro(careful=True)
- DEBUG Initialising zopeless.
+ DEBUG Initializing zopeless.
DEBUG Distribution: ubuntutest
...
DEBUG Added /var/tmp/archive/ubuntutest/pool/universe/b/bar/bar_1.0-2_i386.deb from library
@@ -725,7 +725,7 @@
uploaded in the test above don't break the assumptions of this test.
>>> run_publish_distro(careful_publishing=True)
- DEBUG Initialising zopeless.
+ DEBUG Initializing zopeless.
DEBUG Distribution: ubuntutest
...
DEBUG /var/tmp/archive/ubuntutest/pool/universe/b/bar/bar_1.0-2_i386.deb is already in pool with the same content.
=== modified file 'lib/lp/soyuz/doc/soyuz-upload.txt'
--- lib/lp/soyuz/doc/soyuz-upload.txt 2011-05-20 05:03:38 +0000
+++ lib/lp/soyuz/doc/soyuz-upload.txt 2011-06-10 08:21:09 +0000
@@ -561,7 +561,7 @@
>>> print stdout
<BLANKLINE>
>>> print stderr
- DEBUG Initialising zopeless.
+ DEBUG Initializing zopeless.
DEBUG Distribution: ubuntutest
...
DEBUG Added /var/tmp/archive/ubuntutest/pool/universe/e/etherwake/etherwake_1.08.orig.tar.gz from library
@@ -658,7 +658,7 @@
already on disk, verify the contents are as expected.
>>> print stderr
- DEBUG Initialising zopeless.
+ DEBUG Initializing zopeless.
DEBUG Distribution: ubuntutest
...
DEBUG /var/tmp/archive/ubuntutest/pool/universe/e/etherwake/etherwake_1.08.orig.tar.gz is already in pool with the same content.
@@ -749,7 +749,7 @@
0
>>> print stderr
DEBUG Acquiring lock
- DEBUG Initialising connection.
+ DEBUG Initializing connection.
DEBUG Considering Sources:
DEBUG Processing /var/tmp/archive/ubuntutest/dists/breezy-autotest/restricted/source/Sources.gz
DEBUG Processing /var/tmp/archive/ubuntutest/dists/breezy-autotest/main/source/Sources.gz
=== modified file 'lib/lp/soyuz/interfaces/distributionjob.py'
--- lib/lp/soyuz/interfaces/distributionjob.py 2011-05-31 08:19:08 +0000
+++ lib/lp/soyuz/interfaces/distributionjob.py 2011-06-10 08:21:09 +0000
@@ -8,8 +8,8 @@
"IDistributionJob",
"IDistroSeriesDifferenceJob",
"IDistroSeriesDifferenceJobSource",
- "IInitialiseDistroSeriesJob",
- "IInitialiseDistroSeriesJobSource",
+ "IInitializeDistroSeriesJob",
+ "IInitializeDistroSeriesJobSource",
]
from lazr.enum import (
@@ -36,7 +36,7 @@
class IDistributionJob(Interface):
- """A Job that initialises acts on a distribution."""
+ """A Job that initializes acts on a distribution."""
id = Int(
title=_('DB ID'), required=True, readonly=True,
@@ -61,10 +61,10 @@
class DistributionJobType(DBEnumeratedType):
- INITIALISE_SERIES = DBItem(1, """
- Initialise a Distro Series.
+ INITIALIZE_SERIES = DBItem(1, """
+ Initialize a Distro Series.
- This job initialises a given distro series, creating builds, and
+ This job initializes a given distro series, creating builds, and
populating the archive from the parent distroseries.
""")
@@ -76,19 +76,19 @@
""")
-class IInitialiseDistroSeriesJobSource(IJobSource):
- """An interface for acquiring IInitialiseDistroSeriesJobs."""
+class IInitializeDistroSeriesJobSource(IJobSource):
+ """An interface for acquiring IInitializeDistroSeriesJobs."""
def create(parents, arches, packagesets, rebuild, overlay,
overlay_pockets, overlay_components):
- """Create a new initialisation job for a distroseries."""
+ """Create a new initialization job for a distroseries."""
def getPendingJobsForDistroseries(distroseries):
- """Retrieve pending initialisation jobs for a distroseries.
+ """Retrieve pending initialization jobs for a distroseries.
"""
-class IInitialiseDistroSeriesJob(IRunnableJob):
+class IInitializeDistroSeriesJob(IRunnableJob):
"""A Job that performs actions on a distribution."""
=== modified file 'lib/lp/soyuz/interfaces/publishing.py'
--- lib/lp/soyuz/interfaces/publishing.py 2011-05-30 22:16:13 +0000
+++ lib/lp/soyuz/interfaces/publishing.py 2011-06-10 08:21:09 +0000
@@ -127,7 +127,7 @@
def publish(diskpool, log, archive, pocket, careful=False):
"""Publish associated publishing records targeted for a given pocket.
- Require an initialised diskpool instance and a logger instance.
+ Require an initialized diskpool instance and a logger instance.
Require an 'archive' which will restrict the publications.
'careful' argument would cause the 'republication' of all published
records if True (system will DTRT checking hash of all
=== modified file 'lib/lp/soyuz/interfaces/queue.py'
--- lib/lp/soyuz/interfaces/queue.py 2011-06-03 10:38:25 +0000
+++ lib/lp/soyuz/interfaces/queue.py 2011-06-10 08:21:09 +0000
@@ -92,7 +92,7 @@
"""Used to establish permission to a group of package uploads.
Recieves an IDistroSeries and a PackageUploadStatus dbschema
- on initialisation.
+ on initialization.
No attributes exposed via interface, only used to check permissions.
"""
=== renamed file 'lib/lp/soyuz/model/initialisedistroseriesjob.py' => 'lib/lp/soyuz/model/initializedistroseriesjob.py'
--- lib/lp/soyuz/model/initialisedistroseriesjob.py 2011-06-07 09:49:58 +0000
+++ lib/lp/soyuz/model/initializedistroseriesjob.py 2011-06-10 08:21:09 +0000
@@ -4,7 +4,7 @@
__metaclass__ = type
__all__ = [
- "InitialiseDistroSeriesJob",
+ "InitializeDistroSeriesJob",
]
from zope.interface import (
@@ -19,28 +19,28 @@
from lp.services.job.model.job import Job
from lp.soyuz.interfaces.distributionjob import (
DistributionJobType,
- IInitialiseDistroSeriesJob,
- IInitialiseDistroSeriesJobSource,
+ IInitializeDistroSeriesJob,
+ IInitializeDistroSeriesJobSource,
)
from lp.soyuz.model.distributionjob import (
DistributionJob,
DistributionJobDerived,
)
-from lp.soyuz.scripts.initialise_distroseries import InitialiseDistroSeries
-
-
-class InitialiseDistroSeriesJob(DistributionJobDerived):
-
- implements(IInitialiseDistroSeriesJob)
-
- class_job_type = DistributionJobType.INITIALISE_SERIES
- classProvides(IInitialiseDistroSeriesJobSource)
+from lp.soyuz.scripts.initialize_distroseries import InitializeDistroSeries
+
+
+class InitializeDistroSeriesJob(DistributionJobDerived):
+
+ implements(IInitializeDistroSeriesJob)
+
+ class_job_type = DistributionJobType.INITIALIZE_SERIES
+ classProvides(IInitializeDistroSeriesJobSource)
@classmethod
def create(cls, child, parents, arches=(), packagesets=(),
rebuild=False, overlays=(), overlay_pockets=(),
overlay_components=()):
- """See `IInitialiseDistroSeriesJob`."""
+ """See `IInitializeDistroSeriesJob`."""
metadata = {
'parents': parents,
'arches': arches,
@@ -58,12 +58,12 @@
@classmethod
def getPendingJobsForDistroseries(cls, distroseries):
- """See `IInitialiseDistroSeriesJob`."""
+ """See `IInitializeDistroSeriesJob`."""
return IStore(DistributionJob).find(
DistributionJob,
DistributionJob.job_id == Job.id,
DistributionJob.job_type ==
- DistributionJobType.INITIALISE_SERIES,
+ DistributionJobType.INITIALIZE_SERIES,
DistributionJob.distroseries_id == distroseries.id,
Job._status.is_in(Job.PENDING_STATUSES))
@@ -112,15 +112,15 @@
def run(self):
"""See `IRunnableJob`."""
- ids = InitialiseDistroSeries(
+ ids = InitializeDistroSeries(
self.distroseries, self.parents, self.arches,
self.packagesets, self.rebuild, self.overlays,
self.overlay_pockets, self.overlay_components)
ids.check()
- ids.initialise()
+ ids.initialize()
def getOopsVars(self):
"""See `IRunnableJob`."""
- vars = super(InitialiseDistroSeriesJob, self).getOopsVars()
+ vars = super(InitializeDistroSeriesJob, self).getOopsVars()
vars.append(('parent_distroseries_ids', self.metadata.get("parents")))
return vars
=== modified file 'lib/lp/soyuz/model/sourcepackagerelease.py'
--- lib/lp/soyuz/model/sourcepackagerelease.py 2011-05-27 21:12:25 +0000
+++ lib/lp/soyuz/model/sourcepackagerelease.py 2011-06-10 08:21:09 +0000
@@ -471,7 +471,7 @@
sqlvalues(archive.id, distroarchseries.architecturetag, self))]
# XXX bigjools 2011-05-04 bug=777234
- # We'll need exceptions in here for when we start initialising
+ # We'll need exceptions in here for when we start initializing
# derived distros without rebuilding binaries. The matched
# archives will need to traverse the DistroSeriesParent tree.
=== modified file 'lib/lp/soyuz/scripts/changeoverride.py'
--- lib/lp/soyuz/scripts/changeoverride.py 2010-08-26 08:00:44 +0000
+++ lib/lp/soyuz/scripts/changeoverride.py 2011-06-10 08:21:09 +0000
@@ -25,7 +25,7 @@
class ArchiveOverriderError(SoyuzScriptError):
"""ArchiveOverrider specific exception.
- Mostly used to describe errors in the initialisation of this object.
+ Mostly used to describe errors in the initialization of this object.
"""
=== modified file 'lib/lp/soyuz/scripts/ftpmaster.py'
--- lib/lp/soyuz/scripts/ftpmaster.py 2011-05-27 21:12:25 +0000
+++ lib/lp/soyuz/scripts/ftpmaster.py 2011-06-10 08:21:09 +0000
@@ -71,7 +71,7 @@
class ArchiveCruftCheckerError(Exception):
"""ArchiveCruftChecker specific exception.
- Mostly used to describe errors in the initialisation of this object.
+ Mostly used to describe errors in the initialization of this object.
"""
@@ -400,7 +400,7 @@
self.logger.debug("No NBS found")
def initialize(self):
- """Initialise and build required lists of obsolete entries in archive.
+ """Initialize and build required lists of obsolete entries in archive.
Check integrity of passed parameters and store organised data.
The result list is the self.nbs_to_remove which should contain
@@ -952,9 +952,9 @@
"""Main class for scripts/ftpmaster-tools/lp-query-distro.py."""
def __init__(self, *args, **kwargs):
- """Initialise dynamic 'usage' message and LaunchpadScript parent.
+ """Initialize dynamic 'usage' message and LaunchpadScript parent.
- Also initialise the list 'allowed_arguments'.
+ Also initialize the list 'allowed_arguments'.
"""
self.allowed_actions = [
'current', 'development', 'supported', 'pending_suites', 'archs',
@@ -1001,7 +1001,7 @@
print result
def runAction(self, presenter=None):
- """Run a given initialised action (self.action_name).
+ """Run a given initialized action (self.action_name).
It accepts an optional 'presenter' which will be used to
store/present the action result.
@@ -1398,7 +1398,7 @@
self.options.confirm_all = True
self.logger.debug(
- "Initialising ChrootManager for '%s'" % (distroarchseries.title))
+ "Initializing ChrootManager for '%s'" % (distroarchseries.title))
chroot_manager = ChrootManager(
distroarchseries, filepath=self.options.filepath)
=== renamed file 'lib/lp/soyuz/scripts/initialise_distroseries.py' => 'lib/lp/soyuz/scripts/initialize_distroseries.py'
--- lib/lp/soyuz/scripts/initialise_distroseries.py 2011-06-01 12:46:52 +0000
+++ lib/lp/soyuz/scripts/initialize_distroseries.py 2011-06-10 08:21:09 +0000
@@ -1,13 +1,13 @@
# Copyright 2009-2011 Canonical Ltd. This software is licensed under the
# GNU Affero General Public License version 3 (see the file LICENSE).
-"""Initialise a distroseries from its parent distroseries."""
+"""Initialize a distroseries from its parent distroseries."""
__metaclass__ = type
__all__ = [
- 'InitialisationError',
- 'InitialiseDistroSeries',
+ 'InitializationError',
+ 'InitializeDistroSeries',
]
from operator import methodcaller
@@ -36,11 +36,11 @@
from lp.soyuz.model.packageset import Packageset
-class InitialisationError(Exception):
- """Raised when there is an exception during the initialisation process."""
-
-
-class InitialiseDistroSeries:
+class InitializationError(Exception):
+ """Raised when there is an exception during the initialization process."""
+
+
+class InitializeDistroSeries:
"""Copy in all of the parent distroseries's configuration. This
includes all configuration for distroseries as well as distroarchseries,
publishing and all publishing records for sources and binaries.
@@ -60,12 +60,12 @@
structures.
Note:
- This method will raise a InitialisationError when the pre-conditions
+ This method will raise a InitializationError when the pre-conditions
are not met. After this is run, you still need to construct chroots
for building, you need to add anything missing wrt. ports etc. This
method is only meant to give you a basic copy of a parent series in
order to assist you in preparing a new series of a distribution or
- in the initialisation of a derivative.
+ in the initialization of a derivative.
"""
def __init__(
@@ -76,7 +76,7 @@
from lp.registry.model.distroseries import DistroSeries
# XXX: rvb 2011-05-27 bug=789091: This code should be fixed to support
- # initialising from multiple parents.
+ # initializing from multiple parents.
self.parent_id = parents[0]
self.parent = IStore(
DistroSeries).get(DistroSeries, int(self.parent_id))
@@ -93,7 +93,7 @@
def check(self):
if self.distroseries.is_derived_series:
- raise InitialisationError(
+ raise InitializationError(
("DistroSeries {child.name} has already been initialized"
".").format(
child=self.distroseries))
@@ -106,7 +106,7 @@
"""Assert there are no pending builds for parent series.
Only cares about the RELEASE pocket, which is the only one inherited
- via initialiseFromParent method.
+ via initializeFromParent method.
"""
# only the RELEASE pocket is inherited, so we only check
# pending build records for it.
@@ -114,13 +114,13 @@
BuildStatus.NEEDSBUILD, pocket=PackagePublishingPocket.RELEASE)
if pending_builds.any():
- raise InitialisationError("Parent series has pending builds.")
+ raise InitializationError("Parent series has pending builds.")
def _checkQueue(self):
"""Assert upload queue is empty on parent series.
Only cares about the RELEASE pocket, which is the only one inherited
- via initialiseFromParent method.
+ via initializeFromParent method.
"""
# only the RELEASE pocket is inherited, so we only check
# queue items for it.
@@ -130,35 +130,35 @@
items = self.parent.getQueueItems(
queue, pocket=PackagePublishingPocket.RELEASE)
if items:
- raise InitialisationError(
+ raise InitializationError(
"Parent series queues are not empty.")
def _checkSeries(self):
error = (
"Can not copy distroarchseries from parent, there are "
- "already distroarchseries(s) initialised for this series.")
+ "already distroarchseries(s) initialized for this series.")
sources = self.distroseries.getAllPublishedSources()
binaries = self.distroseries.getAllPublishedBinaries()
if not all(
map(methodcaller('is_empty'), (
sources, binaries, self.distroseries.architectures,
self.distroseries.sections))):
- raise InitialisationError(error)
+ raise InitializationError(error)
if self.distroseries.components:
- raise InitialisationError(error)
+ raise InitializationError(error)
- def initialise(self):
+ def initialize(self):
self._set_parent()
self._copy_configuration()
self._copy_architectures()
self._copy_packages()
self._copy_packagesets()
- self._set_initialised()
+ self._set_initialized()
transaction.commit()
def _set_parent(self):
# XXX: rvb 2011-05-27 bug=789091: This code should be fixed to support
- # initialising from multiple parents.
+ # initializing from multiple parents.
dsp_set = getUtility(IDistroSeriesParentSet)
if self.overlays and self.overlays[0]:
pocket = PackagePublishingPocket.__metaclass__.getTermByToken(
@@ -171,7 +171,7 @@
else:
dsp_set.new(self.distroseries, self.parent, initialized=False)
- def _set_initialised(self):
+ def _set_initialized(self):
dsp_set = getUtility(IDistroSeriesParentSet)
distroseriesparent = dsp_set.getByDerivedAndParentSeries(
self.distroseries, self.parent)
@@ -334,7 +334,7 @@
parent_to_child = {}
# Create the packagesets, and any archivepermissions
for parent_ps in packagesets:
- # Cross-distro initialisations get packagesets owned by the
+ # Cross-distro initializations get packagesets owned by the
# distro owner, otherwise the old owner is preserved.
if self.packagesets and str(parent_ps.id) not in self.packagesets:
continue
=== modified file 'lib/lp/soyuz/scripts/queue.py'
--- lib/lp/soyuz/scripts/queue.py 2011-06-01 05:45:53 +0000
+++ lib/lp/soyuz/scripts/queue.py 2011-06-10 08:21:09 +0000
@@ -80,7 +80,7 @@
def __init__(self, distribution_name, suite_name, queue, terms,
component_name, section_name, priority_name,
display, no_mail=True, exact_match=False, log=None):
- """Initialises passed variables. """
+ """Initializes passed variables. """
self.terms = terms
# Some actions have addtional commands at the start of the terms
# so allow them to state that here by specifiying the start index.
=== modified file 'lib/lp/soyuz/scripts/soyuz_process_upload.py'
--- lib/lp/soyuz/scripts/soyuz_process_upload.py 2010-10-02 11:41:43 +0000
+++ lib/lp/soyuz/scripts/soyuz_process_upload.py 2011-06-10 08:21:09 +0000
@@ -76,7 +76,7 @@
raise LaunchpadScriptFailure(
"%s is not a directory" % self.options.base_fsroot)
- self.logger.debug("Initialising connection.")
+ self.logger.debug("Initializing connection.")
def getPolicy(distro, build):
self.options.distro = distro.name
policy = findPolicyByName(self.options.context)
=== modified file 'lib/lp/soyuz/scripts/tests/test_changeoverride.py'
--- lib/lp/soyuz/scripts/tests/test_changeoverride.py 2010-12-23 00:38:29 +0000
+++ lib/lp/soyuz/scripts/tests/test_changeoverride.py 2011-06-10 08:21:09 +0000
@@ -153,7 +153,7 @@
changer.processBinaryChange = fakeProcessBinaryChange
changer.processChildrenChange = fakeProcessChildrenChange
- # Consume the initialisation logging.
+ # Consume the initialization logging.
changer.logger.clearLogBuffer()
return changer
=== modified file 'lib/lp/soyuz/scripts/tests/test_copypackage.py'
--- lib/lp/soyuz/scripts/tests/test_copypackage.py 2011-06-03 07:50:41 +0000
+++ lib/lp/soyuz/scripts/tests/test_copypackage.py 2011-06-10 08:21:09 +0000
@@ -449,7 +449,7 @@
def assertCanCopySourceOnly(self, delayed=False):
"""Source-only copy is allowed.
- Initialise a `CopyChecker` and assert a `checkCopy` call returns
+ Initialize a `CopyChecker` and assert a `checkCopy` call returns
None (more importantly, doesn't raise `CannotCopy`) in the test
suite context.
@@ -477,7 +477,7 @@
def assertCanCopyBinaries(self, delayed=False):
"""Source and binary copy is allowed.
- Initialise a `CopyChecker` and assert a `checkCopy` call returns
+ Initialize a `CopyChecker` and assert a `checkCopy` call returns
None (more importantly, doesn't raise `CannotCopy`) in the test
suite context.
@@ -966,7 +966,7 @@
binary.copyTo(hoary, source.pocket, source.archive)
# Create a fresh PPA for ubuntutest, which will be the copy
- # destination and initialise a CopyChecker for it.
+ # destination and initialize a CopyChecker for it.
archive = self.factory.makeArchive(
distribution=self.test_publisher.ubuntutest,
purpose=ArchivePurpose.PPA)
@@ -1027,7 +1027,7 @@
# the case (restricted files being copied to public archives).
# However this feature can be turned off, and the operation can
# be performed as a direct-copy by passing 'allow_delayed_copies'
- # as False when initialising `CopyChecker`.
+ # as False when initializing `CopyChecker`.
# This aspect is currently only used in `UnembargoSecurityPackage`
# script class, because it performs the file privacy fixes in
# place.
@@ -2070,7 +2070,7 @@
self.checkCopies(copied, target_archive, 2)
def getTestPublisher(self, distroseries):
- """Return a initialised `SoyuzTestPublisher` object.
+ """Return a initialized `SoyuzTestPublisher` object.
Setup a i386 chroot for the given distroseries, so it can build
and publish binaries.
=== renamed file 'lib/lp/soyuz/scripts/tests/test_initialise_distroseries.py' => 'lib/lp/soyuz/scripts/tests/test_initialize_distroseries.py'
--- lib/lp/soyuz/scripts/tests/test_initialise_distroseries.py 2011-06-08 11:06:04 +0000
+++ lib/lp/soyuz/scripts/tests/test_initialize_distroseries.py 2011-06-10 08:21:09 +0000
@@ -1,7 +1,7 @@
# Copyright 2010-2011 Canonical Ltd. This software is licensed under the
# GNU Affero General Public License version 3 (see the file LICENSE).
-"""Test the initialise_distroseries script machinery."""
+"""Test the initialize_distroseries script machinery."""
__metaclass__ = type
@@ -32,19 +32,19 @@
ISourcePackageFormatSelectionSet,
)
from lp.soyuz.model.distroarchseries import DistroArchSeries
-from lp.soyuz.scripts.initialise_distroseries import (
- InitialisationError,
- InitialiseDistroSeries,
+from lp.soyuz.scripts.initialize_distroseries import (
+ InitializationError,
+ InitializeDistroSeries,
)
from lp.testing import TestCaseWithFactory
-class TestInitialiseDistroSeries(TestCaseWithFactory):
+class TestInitializeDistroSeries(TestCaseWithFactory):
layer = LaunchpadZopelessLayer
def setUp(self):
- super(TestInitialiseDistroSeries, self).setUp()
+ super(TestInitializeDistroSeries, self).setUp()
self.parent = self.factory.makeDistroSeries()
pf = self.factory.makeProcessorFamily()
pf.addProcessor('x86', '', '')
@@ -89,54 +89,54 @@
status=PackagePublishingStatus.PUBLISHED)
def test_failure_for_already_released_distroseries(self):
- # Initialising a distro series that has already been used will
+ # Initializing a distro series that has already been used will
# error.
child = self.factory.makeDistroSeries()
self.factory.makeDistroArchSeries(distroseries=child)
- ids = InitialiseDistroSeries(child, [self.parent.id])
+ ids = InitializeDistroSeries(child, [self.parent.id])
self.assertRaisesWithContent(
- InitialisationError,
+ InitializationError,
"Can not copy distroarchseries from parent, there are already "
- "distroarchseries(s) initialised for this series.", ids.check)
+ "distroarchseries(s) initialized for this series.", ids.check)
def test_failure_with_pending_builds(self):
# If the parent series has pending builds, and the child is a series
# of the same distribution (which means they share an archive), we
- # can't initialise.
+ # can't initialize.
source = self.factory.makeSourcePackagePublishingHistory(
distroseries=self.parent,
pocket=PackagePublishingPocket.RELEASE)
source.createMissingBuilds()
child = self.factory.makeDistroSeries(
distribution=self.parent.parent)
- ids = InitialiseDistroSeries(child, [self.parent.id])
+ ids = InitializeDistroSeries(child, [self.parent.id])
self.assertRaisesWithContent(
- InitialisationError, "Parent series has pending builds.",
+ InitializationError, "Parent series has pending builds.",
ids.check)
def test_success_with_pending_builds(self):
# If the parent series has pending builds, and the child's
- # distribution is different, we can initialise.
+ # distribution is different, we can initialize.
source = self.factory.makeSourcePackagePublishingHistory(
distroseries=self.parent,
pocket=PackagePublishingPocket.RELEASE)
source.createMissingBuilds()
- child = self._full_initialise()
- self.assertDistroSeriesInitialisedCorrectly(child)
+ child = self._full_initialize()
+ self.assertDistroSeriesInitializedCorrectly(child)
def test_failure_with_queue_items(self):
# If the parent series has items in its queues, such as NEW and
- # UNAPPROVED, we can't initialise.
+ # UNAPPROVED, we can't initialize.
self.parent.createQueueEntry(
PackagePublishingPocket.RELEASE, self.parent.main_archive,
'foo.changes', 'bar')
child = self.factory.makeDistroSeries()
- ids = InitialiseDistroSeries(child, [self.parent.id])
+ ids = InitializeDistroSeries(child, [self.parent.id])
self.assertRaisesWithContent(
- InitialisationError, "Parent series queues are not empty.",
+ InitializationError, "Parent series queues are not empty.",
ids.check)
- def assertDistroSeriesInitialisedCorrectly(self, child):
+ def assertDistroSeriesInitializedCorrectly(self, child):
# Check that 'udev' has been copied correctly.
parent_udev_pubs = self.parent.getPublishedSources('udev')
child_udev_pubs = child.getPublishedSources('udev')
@@ -172,30 +172,30 @@
# Other configuration bits are copied too.
self.assertTrue(child.backports_not_automatic)
- def _full_initialise(self, child=None, arches=(), packagesets=(),
+ def _full_initialize(self, child=None, arches=(), packagesets=(),
rebuild=False, distribution=None, overlays=(),
overlay_pockets=(), overlay_components=()):
if child is None:
child = self.factory.makeDistroSeries(distribution=distribution)
- ids = InitialiseDistroSeries(
+ ids = InitializeDistroSeries(
child, [self.parent.id], arches, packagesets, rebuild, overlays,
overlay_pockets, overlay_components)
ids.check()
- ids.initialise()
+ ids.initialize()
return child
- def test_initialise(self):
- # Test a full initialise with no errors.
- child = self._full_initialise()
- self.assertDistroSeriesInitialisedCorrectly(child)
+ def test_initialize(self):
+ # Test a full initialize with no errors.
+ child = self._full_initialize()
+ self.assertDistroSeriesInitializedCorrectly(child)
- def test_initialise_only_one_das(self):
- # Test a full initialise with no errors, but only copy i386 to
+ def test_initialize_only_one_das(self):
+ # Test a full initialize with no errors, but only copy i386 to
# the child.
self.factory.makeDistroArchSeries(distroseries=self.parent)
- child = self._full_initialise(
+ child = self._full_initialize(
arches=[self.parent_das.architecturetag])
- self.assertDistroSeriesInitialisedCorrectly(child)
+ self.assertDistroSeriesInitializedCorrectly(child)
das = list(IStore(DistroArchSeries).find(
DistroArchSeries, distroseries=child))
self.assertEqual(len(das), 1)
@@ -217,7 +217,7 @@
test1.addSources('udev')
getUtility(IArchivePermissionSet).newPackagesetUploader(
self.parent.main_archive, uploader, test1)
- child = self._full_initialise()
+ child = self._full_initialize()
# We can fetch the copied sets from the child.
child_test1 = getUtility(IPackagesetSet).getByName(
u'test1', distroseries=child)
@@ -253,23 +253,23 @@
distroseries=child))
def test_packageset_owner_preserved_within_distro(self):
- # When initialising a new series within a distro, the copied
+ # When initializing a new series within a distro, the copied
# packagesets have ownership preserved.
ps_owner = self.factory.makePerson()
getUtility(IPackagesetSet).new(
u'ps', u'packageset', ps_owner, distroseries=self.parent)
- child = self._full_initialise(distribution=self.parent.distribution)
+ child = self._full_initialize(distribution=self.parent.distribution)
child_ps = getUtility(IPackagesetSet).getByName(
u'ps', distroseries=child)
self.assertEqual(ps_owner, child_ps.owner)
def test_packageset_owner_not_preserved_cross_distro(self):
- # In the case of a cross-distro initialisation, the new
+ # In the case of a cross-distro initialization, the new
# packagesets are owned by the new distro owner.
getUtility(IPackagesetSet).new(
u'ps', u'packageset', self.factory.makePerson(),
distroseries=self.parent)
- child = self._full_initialise()
+ child = self._full_initialize()
child_ps = getUtility(IPackagesetSet).getByName(
u'ps', distroseries=child)
self.assertEqual(child.owner, child_ps.owner)
@@ -288,7 +288,7 @@
test1.addSources(pkg)
packageset1 = getUtility(IPackagesetSet).getByName(
u'test1', distroseries=self.parent)
- child = self._full_initialise(packagesets=(str(packageset1.id),))
+ child = self._full_initialize(packagesets=(str(packageset1.id),))
child_test1 = getUtility(IPackagesetSet).getByName(
u'test1', distroseries=child)
self.assertEqual(test1.description, child_test1.description)
@@ -306,7 +306,7 @@
def test_rebuild_flag(self):
# No binaries will get copied if we specify rebuild=True.
self.parent.updatePackageCount()
- child = self._full_initialise(rebuild=True)
+ child = self._full_initialize(rebuild=True)
child.updatePackageCount()
builds = child.getBuildRecords(
build_state=BuildStatus.NEEDSBUILD,
@@ -328,7 +328,7 @@
for pkg in packages:
test1.addSources(pkg)
self.factory.makeDistroArchSeries(distroseries=self.parent)
- child = self._full_initialise(
+ child = self._full_initialize(
arches=[self.parent_das.architecturetag],
packagesets=(str(test1.id),), rebuild=True)
child.updatePackageCount()
@@ -349,7 +349,7 @@
ppc_das = self.factory.makeDistroArchSeries(
distroseries=self.parent)
ppc_das.enabled = False
- child = self._full_initialise()
+ child = self._full_initialize()
das = list(IStore(DistroArchSeries).find(
DistroArchSeries, distroseries=child))
self.assertEqual(len(das), 1)
@@ -365,7 +365,7 @@
test1.addSources('udev')
getUtility(IArchivePermissionSet).newPackagesetUploader(
self.parent.main_archive, uploader, test1)
- # The child must have a parent series because initialise-from-parent
+ # The child must have a parent series because initialize-from-parent
# expects it; this script supports the old-style derivation of
# distribution series where the parent series is specified at the time
# of adding the series. New-style derivation leaves the specification
@@ -374,7 +374,7 @@
transaction.commit()
ifp = os.path.join(
config.root, 'scripts', 'ftpmaster-tools',
- 'initialise-from-parent.py')
+ 'initialize-from-parent.py')
process = subprocess.Popen(
[sys.executable, ifp, "-vv", "-d", child.parent.name,
child.name], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
@@ -385,12 +385,12 @@
self.assertTrue(
"DEBUG Committing transaction." in stderr.split('\n'))
transaction.commit()
- self.assertDistroSeriesInitialisedCorrectly(child)
+ self.assertDistroSeriesInitializedCorrectly(child)
def test_is_initialized(self):
- # At the end of the initialisation, the distroseriesparent is marked
- # as 'initialised'.
- child = self._full_initialise(rebuild=True, overlays=())
+ # At the end of the initialization, the distroseriesparent is marked
+ # as 'initialized'.
+ child = self._full_initialize(rebuild=True, overlays=())
dsp_set = getUtility(IDistroSeriesParentSet)
distroseriesparent = dsp_set.getByDerivedAndParentSeries(
child, self.parent)
@@ -399,7 +399,7 @@
def test_no_overlays(self):
# Without the overlay parameter, no overlays are created.
- child = self._full_initialise(rebuild=True, overlays=[])
+ child = self._full_initialize(rebuild=True, overlays=[])
dsp_set = getUtility(IDistroSeriesParentSet)
distroseriesparent = dsp_set.getByDerivedAndParentSeries(
child, self.parent)
@@ -412,7 +412,7 @@
overlays = [True]
overlay_pockets = ['Updates']
overlay_components = ['universe']
- child = self._full_initialise(
+ child = self._full_initialize(
child=child, rebuild=True, overlays=overlays,
overlay_pockets=overlay_pockets,
overlay_components=overlay_components)
=== modified file 'lib/lp/soyuz/scripts/tests/test_processpendingpackagediffs.py'
--- lib/lp/soyuz/scripts/tests/test_processpendingpackagediffs.py 2010-12-20 03:21:03 +0000
+++ lib/lp/soyuz/scripts/tests/test_processpendingpackagediffs.py 2011-06-10 08:21:09 +0000
@@ -53,7 +53,7 @@
:param limit: if passed, it will be used as the 'limit' script
argument.
- :return the initialised script object using `BufferLogger` and
+ :return the initialized script object using `BufferLogger` and
the given parameters.
"""
test_args = []
=== modified file 'lib/lp/soyuz/scripts/tests/test_queue.py'
--- lib/lp/soyuz/scripts/tests/test_queue.py 2011-06-01 05:45:53 +0000
+++ lib/lp/soyuz/scripts/tests/test_queue.py 2011-06-10 08:21:09 +0000
@@ -96,7 +96,7 @@
suite_name='breezy-autotest', quiet=True):
"""Helper method to execute a queue command.
- Initialise output buffer and execute a command according
+ Initialize output buffer and execute a command according
given argument.
Return the used QueueAction instance.
=== modified file 'lib/lp/soyuz/stories/ppa/xx-ppa-files.txt'
--- lib/lp/soyuz/stories/ppa/xx-ppa-files.txt 2011-05-20 04:35:00 +0000
+++ lib/lp/soyuz/stories/ppa/xx-ppa-files.txt 2011-06-10 08:21:09 +0000
@@ -28,7 +28,7 @@
... owner=no_priv, private=True, name='p3a',
... distribution=ubuntu)
-Initialise SoyuzTestPublisher.
+Initialize SoyuzTestPublisher.
>>> test_publisher = SoyuzTestPublisher()
>>> test_publisher.prepareBreezyAutotest()
=== modified file 'lib/lp/soyuz/stories/soyuz/xx-builds-pages.txt'
--- lib/lp/soyuz/stories/soyuz/xx-builds-pages.txt 2010-10-18 22:24:59 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-builds-pages.txt 2011-06-10 08:21:09 +0000
@@ -112,7 +112,7 @@
== Build titles ==
The anonymous user can review the build titles, including 'not
-initialised' one (fix bug #52704).
+initialized' one (fix bug #52704).
* SUPERSEDED and NEEDSBUILD builds contain title
=== modified file 'lib/lp/soyuz/tests/test_distroseriesdifferencejob.py'
--- lib/lp/soyuz/tests/test_distroseriesdifferencejob.py 2011-05-30 04:06:52 +0000
+++ lib/lp/soyuz/tests/test_distroseriesdifferencejob.py 2011-06-10 08:21:09 +0000
@@ -296,7 +296,7 @@
DistributionJob(
distribution=dsd.derived_series.distribution,
distroseries=dsd.derived_series,
- job_type=DistributionJobType.INITIALISE_SERIES,
+ job_type=DistributionJobType.INITIALIZE_SERIES,
metadata={"sourcepackagename": dsd.source_package_name.id})
self.assertEqual(
{},
=== renamed file 'lib/lp/soyuz/tests/test_initialisedistroseriesjob.py' => 'lib/lp/soyuz/tests/test_initializedistroseriesjob.py'
--- lib/lp/soyuz/tests/test_initialisedistroseriesjob.py 2011-06-07 09:49:58 +0000
+++ lib/lp/soyuz/tests/test_initializedistroseriesjob.py 2011-06-10 08:21:09 +0000
@@ -18,24 +18,24 @@
from lp.registry.interfaces.distroseriesparent import IDistroSeriesParentSet
from lp.registry.interfaces.pocket import PackagePublishingPocket
from lp.soyuz.interfaces.distributionjob import (
- IInitialiseDistroSeriesJobSource,
+ IInitializeDistroSeriesJobSource,
)
from lp.soyuz.interfaces.packageset import IPackagesetSet
from lp.soyuz.interfaces.publishing import PackagePublishingStatus
-from lp.soyuz.model.initialisedistroseriesjob import InitialiseDistroSeriesJob
-from lp.soyuz.scripts.initialise_distroseries import InitialisationError
+from lp.soyuz.model.initializedistroseriesjob import InitializeDistroSeriesJob
+from lp.soyuz.scripts.initialize_distroseries import InitializationError
from lp.soyuz.tests.test_publishing import SoyuzTestPublisher
from lp.testing import TestCaseWithFactory
-class InitialiseDistroSeriesJobTests(TestCaseWithFactory):
- """Test case for InitialiseDistroSeriesJob."""
+class InitializeDistroSeriesJobTests(TestCaseWithFactory):
+ """Test case for InitializeDistroSeriesJob."""
layer = DatabaseFunctionalLayer
@property
def job_source(self):
- return getUtility(IInitialiseDistroSeriesJobSource)
+ return getUtility(IInitializeDistroSeriesJobSource)
def test_getOopsVars(self):
parent = self.factory.makeDistroSeries()
@@ -50,26 +50,26 @@
self.assertIn(('parent_distroseries_ids', [parent.id]), vars)
def _getJobs(self):
- """Return the pending InitialiseDistroSeriesJobs as a list."""
- return list(InitialiseDistroSeriesJob.iterReady())
+ """Return the pending InitializeDistroSeriesJobs as a list."""
+ return list(InitializeDistroSeriesJob.iterReady())
def _getJobCount(self):
- """Return the number of InitialiseDistroSeriesJobs in the
+ """Return the number of InitializeDistroSeriesJobs in the
queue."""
return len(self._getJobs())
def test_create_only_creates_one(self):
parent = self.factory.makeDistroSeries()
distroseries = self.factory.makeDistroSeries()
- # If there's already a InitialiseDistroSeriesJob for a
- # DistroSeries, InitialiseDistroSeriesJob.create() won't create
+ # If there's already a InitializeDistroSeriesJob for a
+ # DistroSeries, InitializeDistroSeriesJob.create() won't create
# a new one.
self.job_source.create(distroseries, [parent.id])
self.job_source.create(distroseries, [parent.id])
self.assertRaises(IntegrityError, flush_database_caches)
def test_run_with_previous_series_already_set(self):
- # InitialisationError is raised if a parent series already exists
+ # InitializationError is raised if a parent series already exists
# for this series.
parent = self.factory.makeDistroSeries()
distroseries = self.factory.makeDistroSeries()
@@ -81,10 +81,10 @@
"DistroSeries {child.name} has already been initialized"
".").format(child=distroseries)
self.assertRaisesWithContent(
- InitialisationError, expected_message, job.run)
+ InitializationError, expected_message, job.run)
def test_arguments(self):
- """Test that InitialiseDistroSeriesJob specified with arguments can
+ """Test that InitializeDistroSeriesJob specified with arguments can
be gotten out again."""
parent = self.factory.makeDistroSeries()
distroseries = self.factory.makeDistroSeries()
@@ -116,26 +116,26 @@
self.assertEqual((parent.id, ), naked_job.parents)
def test_getPendingJobsForDistroseries(self):
- # Pending initialisation jobs can be retrieved per distroseries.
+ # Pending initialization jobs can be retrieved per distroseries.
parent = self.factory.makeDistroSeries()
distroseries = self.factory.makeDistroSeries()
another_distroseries = self.factory.makeDistroSeries()
self.job_source.create(distroseries, [parent.id])
self.job_source.create(another_distroseries, [parent.id])
- initialise_utility = getUtility(IInitialiseDistroSeriesJobSource)
- [job] = list(initialise_utility.getPendingJobsForDistroseries(
+ initialize_utility = getUtility(IInitializeDistroSeriesJobSource)
+ [job] = list(initialize_utility.getPendingJobsForDistroseries(
distroseries))
self.assertEqual(job.distroseries, distroseries)
-class InitialiseDistroSeriesJobTestsWithPackages(TestCaseWithFactory):
- """Test case for InitialiseDistroSeriesJob."""
+class InitializeDistroSeriesJobTestsWithPackages(TestCaseWithFactory):
+ """Test case for InitializeDistroSeriesJob."""
layer = LaunchpadZopelessLayer
@property
def job_source(self):
- return getUtility(IInitialiseDistroSeriesJobSource)
+ return getUtility(IInitializeDistroSeriesJobSource)
def _create_child(self):
pf = self.factory.makeProcessorFamily()
@@ -171,7 +171,7 @@
def test_job(self):
parent, child = self._create_child()
job = self.job_source.create(child, [parent.id])
- self.layer.switchDbUser('initialisedistroseries')
+ self.layer.switchDbUser('initializedistroseries')
job.run()
child.updatePackageCount()
@@ -184,7 +184,7 @@
job = self.job_source.create(
child, [parent.id], packagesets=(self.test1_packageset_id,),
arches=(arch,), rebuild=True)
- self.layer.switchDbUser('initialisedistroseries')
+ self.layer.switchDbUser('initializedistroseries')
job.run()
child.updatePackageCount()
@@ -201,7 +201,7 @@
child, [parent.id], packagesets=None, arches=None,
overlays=None, overlay_pockets=None,
overlay_components=None, rebuild=True)
- self.layer.switchDbUser('initialisedistroseries')
+ self.layer.switchDbUser('initializedistroseries')
job.run()
child.updatePackageCount()
@@ -209,4 +209,4 @@
def test_cronscript(self):
run_script(
- 'cronscripts/run_jobs.py', ['-v', 'initialisedistroseries'])
+ 'cronscripts/run_jobs.py', ['-v', 'initializedistroseries'])
=== modified file 'lib/lp/testing/factory.py'
--- lib/lp/testing/factory.py 2011-06-09 08:07:52 +0000
+++ lib/lp/testing/factory.py 2011-06-10 08:21:09 +0000
@@ -383,7 +383,7 @@
__metaclass__ = AutoDecorate(default_master_store)
def __init__(self):
- # Initialise the unique identifier.
+ # Initialize the unique identifier.
self._local = local()
def getUniqueEmailAddress(self):
=== modified file 'lib/lp/translations/browser/tests/pofile-views.txt'
--- lib/lp/translations/browser/tests/pofile-views.txt 2011-04-12 11:36:11 +0000
+++ lib/lp/translations/browser/tests/pofile-views.txt 2011-06-10 08:21:09 +0000
@@ -23,7 +23,7 @@
>>> login('no-priv@xxxxxxxxxxxxx')
-Now it's time to test the initialisation of the view class.
+Now it's time to test the initialization of the view class.
>>> sourcepackagenameset = getUtility(ISourcePackageNameSet)
>>> sourcepackagename = sourcepackagenameset['evolution']
=== modified file 'lib/lp/translations/browser/tests/translationimportqueue-views.txt'
--- lib/lp/translations/browser/tests/translationimportqueue-views.txt 2011-05-27 19:53:20 +0000
+++ lib/lp/translations/browser/tests/translationimportqueue-views.txt 2011-06-10 08:21:09 +0000
@@ -59,7 +59,7 @@
>>> isinstance(view, TranslationImportQueueEntryView)
True
-Upon initialisation the view sets the file type.
+Upon initialization the view sets the file type.
>>> print view.initial_values['file_type']
Template
=== modified file 'lib/lp/translations/browser/translationimportqueue.py'
--- lib/lp/translations/browser/translationimportqueue.py 2011-02-24 15:30:54 +0000
+++ lib/lp/translations/browser/translationimportqueue.py 2011-06-10 08:21:09 +0000
@@ -97,7 +97,7 @@
"""Initialize some values on the form, when it's possible."""
field_values = {}
if self.request.method == 'POST':
- # We got a form post, we don't need to do any initialisation.
+ # We got a form post, we don't need to do any initialization.
return field_values
# Fill the know values.
field_values['path'] = self.context.path
@@ -280,7 +280,7 @@
# Only show languagepack for Ubuntu packages.
self.field_names.remove('languagepack')
- # Execute default initialisation.
+ # Execute default initialization.
LaunchpadFormView.initialize(self)
# XXX: HenningEggers 2008-11-21 bug=300608: This code is too generic to be in
=== modified file 'lib/lp/translations/browser/translationmessage.py'
--- lib/lp/translations/browser/translationmessage.py 2011-05-17 21:59:03 +0000
+++ lib/lp/translations/browser/translationmessage.py 2011-06-10 08:21:09 +0000
@@ -1106,7 +1106,7 @@
self.current_series.distribution.displayname,
self.current_series.name)
- # Initialise the translation dictionaries used from the
+ # Initialize the translation dictionaries used from the
# translation form.
self.translation_dictionaries = []
for index in self.pluralform_indices:
=== modified file 'lib/lp/translations/doc/poexport-language-pack.txt'
--- lib/lp/translations/doc/poexport-language-pack.txt 2011-05-27 19:53:20 +0000
+++ lib/lp/translations/doc/poexport-language-pack.txt 2011-06-10 08:21:09 +0000
@@ -4,7 +4,7 @@
Launchpad has a way to export all distribution series translations in a
tarball to provide language packs.
-Some initialisation tasks:
+Some initialization tasks:
>>> import datetime
>>> import pytz
@@ -137,7 +137,7 @@
>>> series = getUtility(IDistributionSet)['ubuntu'].getSeries('grumpy')
-Sample data initialisation
+Sample data initialization
..........................
We need to import an XPI template and a translation to see those files
=== modified file 'lib/lp/translations/interfaces/translationimporter.py'
--- lib/lp/translations/interfaces/translationimporter.py 2010-12-02 16:13:51 +0000
+++ lib/lp/translations/interfaces/translationimporter.py 2011-06-10 08:21:09 +0000
@@ -46,7 +46,7 @@
"""Base exception for errors in translation format files."""
def __init__(self, filename=None, line_number=None, message=None):
- """Initialise the exception information.
+ """Initialize the exception information.
:param filename: The file name that is being parsed.
:param line_number: The line number where the error was found.
=== modified file 'lib/lp/translations/templates/pofile-export.pt'
--- lib/lp/translations/templates/pofile-export.pt 2011-01-04 15:40:56 +0000
+++ lib/lp/translations/templates/pofile-export.pt 2011-06-10 08:21:09 +0000
@@ -30,7 +30,7 @@
}
}
formatlist.on('change', toggle_pochanged);
- // Initialise the state of the controls.
+ // Initialize the state of the controls.
toggle_pochanged();
});
});
=== modified file 'lib/lp/translations/utilities/gettext_po_parser.py'
--- lib/lp/translations/utilities/gettext_po_parser.py 2010-12-13 18:04:24 +0000
+++ lib/lp/translations/utilities/gettext_po_parser.py 2011-06-10 08:21:09 +0000
@@ -516,7 +516,7 @@
def parse(self, content_text):
"""Parse string as a PO file."""
- # Initialise the parser.
+ # Initialize the parser.
self._translation_file = TranslationFileData()
self._messageids = set()
self._pending_chars = content_text
=== modified file 'lib/lp/translations/utilities/tests/test_file_importer.py'
--- lib/lp/translations/utilities/tests/test_file_importer.py 2011-02-11 14:39:56 +0000
+++ lib/lp/translations/utilities/tests/test_file_importer.py 2011-06-10 08:21:09 +0000
@@ -316,13 +316,13 @@
NUMBER_OF_TEST_MESSAGES,
"FileImporter.__init__ did not parse the template file "
"correctly.")
- # Test if POTFileImporter gets initialised correctly.
+ # Test if POTFileImporter gets initialized correctly.
self.failUnless(pot_importer.potemplate is not None,
"POTFileImporter had no reference to an IPOTemplate.")
self.failUnless(pot_importer.pofile is None or
pot_importer.pofile.language == "en",
"POTFileImporter referenced an IPOFile which was not English.")
- # Test if POFileImporter gets initialised correctly.
+ # Test if POFileImporter gets initialized correctly.
self.failUnless(po_importer.potemplate is not None,
"POTFileImporter had no reference to an IPOTemplate.")
self.failUnless(po_importer.pofile is not None,
=== modified file 'scripts/ftpmaster-tools/archive-cruft-check.py'
--- scripts/ftpmaster-tools/archive-cruft-check.py 2010-04-27 19:48:39 +0000
+++ scripts/ftpmaster-tools/archive-cruft-check.py 2011-06-10 08:21:09 +0000
@@ -45,7 +45,7 @@
lock = GlobalLock('/var/lock/launchpad-archive-cruft-check.lock')
lock.acquire(blocking=True)
- log.debug("Initialising connection.")
+ log.debug("Initializing connection.")
execute_zcml_for_scripts()
ztm = initZopeless(dbuser=config.archivepublisher.dbuser)
=== modified file 'scripts/ftpmaster-tools/archive-override-check.py'
--- scripts/ftpmaster-tools/archive-override-check.py 2010-10-03 15:30:06 +0000
+++ scripts/ftpmaster-tools/archive-override-check.py 2011-06-10 08:21:09 +0000
@@ -52,7 +52,7 @@
lock = GlobalLock('/var/lock/archive-override-check.lock')
lock.acquire(blocking=True)
- log.debug("Initialising connection.")
+ log.debug("Initializing connection.")
execute_zcml_for_scripts()
ztm = initZopeless(dbuser=config.archivepublisher.dbuser)
=== modified file 'scripts/ftpmaster-tools/buildd-mass-retry.py'
--- scripts/ftpmaster-tools/buildd-mass-retry.py 2010-10-03 15:30:06 +0000
+++ scripts/ftpmaster-tools/buildd-mass-retry.py 2011-06-10 08:21:09 +0000
@@ -102,7 +102,7 @@
# store distroarchseries as the current IHasBuildRecord provider
build_provider = dar
- log.info("Initialising Build Mass-Retry for '%s/%s'"
+ log.info("Initializing Build Mass-Retry for '%s/%s'"
% (build_provider.title, pocket.name))
requested_states_map = {
=== renamed file 'scripts/ftpmaster-tools/initialise-from-parent.py' => 'scripts/ftpmaster-tools/initialize-from-parent.py'
--- scripts/ftpmaster-tools/initialise-from-parent.py 2011-05-30 17:56:56 +0000
+++ scripts/ftpmaster-tools/initialize-from-parent.py 2011-06-10 08:21:09 +0000
@@ -3,7 +3,7 @@
# Copyright 2009 Canonical Ltd. This software is licensed under the
# GNU Affero General Public License version 3 (see the file LICENSE).
-"""Initialise a new distroseries from its parent series."""
+"""Initialize a new distroseries from its parent series."""
from optparse import OptionParser
import sys
@@ -21,9 +21,9 @@
from canonical.lp import initZopeless
from lp.app.errors import NotFoundError
from lp.registry.interfaces.distribution import IDistributionSet
-from lp.soyuz.scripts.initialise_distroseries import (
- InitialisationError,
- InitialiseDistroSeries,
+from lp.soyuz.scripts.initialize_distroseries import (
+ InitializationError,
+ InitializeDistroSeries,
)
@@ -47,20 +47,20 @@
(options, args) = parser.parse_args()
- log = logger(options, "initialise")
+ log = logger(options, "initialize")
if len(args) != 1:
log.error("Need to be given exactly one non-option argument. "
- "Namely the distroseries to initialise.")
+ "Namely the distroseries to initialize.")
return 1
distroseries_name = args[0]
log.debug("Acquiring lock")
- lock = GlobalLock('/var/lock/launchpad-initialise.lock')
+ lock = GlobalLock('/var/lock/launchpad-initialize.lock')
lock.acquire(blocking=True)
- log.debug("Initialising connection.")
+ log.debug("Initializing connection.")
execute_zcml_for_scripts()
ztm = initZopeless(dbuser=config.archivepublisher.dbuser)
@@ -81,17 +81,17 @@
arches = ()
if options.arches is not None:
arches = tuple(options.arches.split(','))
- # InitialiseDistroSeries does not like it if the parent series is
+ # InitializeDistroSeries does not like it if the parent series is
# specified on the child, so we must unset it and pass it in. This is
- # a temporary hack until confidence in InitialiseDistroSeriesJob is
+ # a temporary hack until confidence in InitializeDistroSeriesJob is
# good, at which point this script will be obsolete.
parent, distroseries.previous_series = (
distroseries.previous_series, None)
- ids = InitialiseDistroSeries(distroseries, [parent.id], arches)
+ ids = InitializeDistroSeries(distroseries, [parent.id], arches)
ids.check()
- log.debug('initialising from parent(s), copying publishing records.')
- ids.initialise()
- except InitialisationError, e:
+ log.debug('initializing from parent(s), copying publishing records.')
+ ids.initialize()
+ except InitializationError, e:
log.error(e)
return 1
=== modified file 'scripts/ftpmaster-tools/queue'
--- scripts/ftpmaster-tools/queue 2011-06-02 09:51:06 +0000
+++ scripts/ftpmaster-tools/queue 2011-06-10 08:21:09 +0000
@@ -95,7 +95,7 @@
no_mail, options.component_name, options.section_name,
options.priority_name, log=log)
- print ("Initialising connection to queue %s" % options.queue_name)
+ print ("Initializing connection to queue %s" % options.queue_name)
execute_zcml_for_scripts()
ztm = initZopeless(dbuser=config.uploadqueue.dbuser,
=== modified file 'scripts/ftpmaster-tools/remove-package.py'
--- scripts/ftpmaster-tools/remove-package.py 2010-11-08 13:20:37 +0000
+++ scripts/ftpmaster-tools/remove-package.py 2011-06-10 08:21:09 +0000
@@ -263,7 +263,7 @@
Lock = GlobalLock('/var/lock/launchpad-remove-package.lock')
Lock.acquire(blocking=True)
- Log.debug("Initialising connection.")
+ Log.debug("Initializing connection.")
execute_zcml_for_scripts()
ztm = initZopeless(dbuser=config.archivepublisher.dbuser)
=== modified file 'scripts/ftpmaster-tools/sync-source.py'
--- scripts/ftpmaster-tools/sync-source.py 2010-12-02 16:13:51 +0000
+++ scripts/ftpmaster-tools/sync-source.py 2011-06-10 08:21:09 +0000
@@ -799,7 +799,7 @@
Lock = GlobalLock('/var/lock/launchpad-sync-source.lock')
Lock.acquire(blocking=True)
- Log.debug("Initialising connection.")
+ Log.debug("Initializing connection.")
execute_zcml_for_scripts()
initZopeless(dbuser="ro")
=== modified file 'scripts/publish-distro.py'
--- scripts/publish-distro.py 2010-04-27 19:48:39 +0000
+++ scripts/publish-distro.py 2011-06-10 08:21:09 +0000
@@ -24,7 +24,7 @@
assert len(args) == 0, "publish-distro takes no arguments, only options."
log = logger(options, "publish-distro")
- log.debug("Initialising zopeless.")
+ log.debug("Initializing zopeless.")
execute_zcml_for_scripts()
txn = initZopeless(dbuser=config.archivepublisher.dbuser)
=== modified file 'utilities/lsconf.py'
--- utilities/lsconf.py 2010-04-27 19:48:39 +0000
+++ utilities/lsconf.py 2011-06-10 08:21:09 +0000
@@ -34,7 +34,7 @@
@classmethod
def load(cls, conf_path, schema_path=None):
- """Initialise the Configuration.
+ """Initialize the Configuration.
:conf_path: The path to the lazr.config conf file.
:schema_path: The path to the lazr.config schema that defines
=== modified file 'utilities/migrater/file-ownership.txt'
--- utilities/migrater/file-ownership.txt 2011-02-17 16:38:15 +0000
+++ utilities/migrater/file-ownership.txt 2011-06-10 08:21:09 +0000
@@ -2110,7 +2110,7 @@
./doc/image-widget.txt
./doc/incomingmail.txt
./doc/initial-bug-contacts.txt
- ./doc/initialise-from-parent.txt
+ ./doc/initialize-from-parent.txt
./doc/keyring_trust_analyser.txt
./doc/language-pack.txt
./doc/language.txt
=== modified file 'utilities/soyuz-sampledata-setup.py'
--- utilities/soyuz-sampledata-setup.py 2011-06-01 13:52:32 +0000
+++ utilities/soyuz-sampledata-setup.py 2011-06-10 08:21:09 +0000
@@ -58,7 +58,7 @@
)
from lp.soyuz.model.section import SectionSelection
from lp.soyuz.model.component import ComponentSelection
-from lp.soyuz.scripts.initialise_distroseries import InitialiseDistroSeries
+from lp.soyuz.scripts.initialize_distroseries import InitializeDistroSeries
from lp.testing.factory import LaunchpadObjectFactory
@@ -228,8 +228,8 @@
new_series.status = status
notify(ObjectCreatedEvent(new_series))
- ids = InitialiseDistroSeries(new_series, [parent.id])
- ids.initialise()
+ ids = InitializeDistroSeries(new_series, [parent.id])
+ ids.initialize()
return new_series
Follow ups
