diff --git a/django/db/models/query.py b/django/db/models/query.py index 909f07114b..626eb11b12 100644 --- a/django/db/models/query.py +++ b/django/db/models/query.py @@ -243,7 +243,7 @@ class QuerySet(object): skip = None if load_fields and not fill_cache: - # Some fields have been deferred, so we have to initialise + # Some fields have been deferred, so we have to initialize # via keyword arguments. skip = set() init_list = [] diff --git a/django/http/response.py b/django/http/response.py index 2eb629cb34..532f8ee1e7 100644 --- a/django/http/response.py +++ b/django/http/response.py @@ -188,7 +188,7 @@ class HttpResponseBase(six.Iterator): def __getstate__(self): # SimpleCookie is not pickeable with pickle.HIGHEST_PROTOCOL, so we - # serialise to a string instead + # serialize to a string instead state = self.__dict__.copy() state['cookies'] = str(state['cookies']) return state diff --git a/django/utils/functional.py b/django/utils/functional.py index 51bbcf0fc9..bb04573587 100644 --- a/django/utils/functional.py +++ b/django/utils/functional.py @@ -260,7 +260,7 @@ class LazyObject(object): def _setup(self): """ - Must be implemented by subclasses to initialise the wrapped object. + Must be implemented by subclasses to initialize the wrapped object. """ raise NotImplementedError('subclasses of LazyObject must provide a _setup() method') diff --git a/tests/properties/tests.py b/tests/properties/tests.py index 3db8fbf0f8..45443026a3 100644 --- a/tests/properties/tests.py +++ b/tests/properties/tests.py @@ -18,7 +18,7 @@ class PropertyTests(TestCase): # The "full_name" property hasn't provided a "set" method. self.assertRaises(AttributeError, setattr, self.a, 'full_name', 'Paul McCartney') - # But "full_name_2" has, and it can be used to initialise the class. + # But "full_name_2" has, and it can be used to initialize the class. a2 = Person(full_name_2='Paul McCartney') a2.save() self.assertEqual(a2.first_name, 'Paul')