diff --git a/django/contrib/admin/static/admin/js/SelectFilter2.js b/django/contrib/admin/static/admin/js/SelectFilter2.js index 4f6f2b7ebf..6c8a4b4453 100644 --- a/django/contrib/admin/static/admin/js/SelectFilter2.js +++ b/django/contrib/admin/static/admin/js/SelectFilter2.js @@ -15,7 +15,7 @@ function findForm(node) { window.SelectFilter = { init: function(field_id, field_name, is_stacked, admin_static_prefix) { if (field_id.match(/__prefix__/)){ - // Don't intialize on empty forms. + // Don't initialize on empty forms. return; } var from_box = document.getElementById(field_id); diff --git a/django/contrib/auth/tests/test_forms.py b/django/contrib/auth/tests/test_forms.py index 8b44437800..0c13e8af74 100644 --- a/django/contrib/auth/tests/test_forms.py +++ b/django/contrib/auth/tests/test_forms.py @@ -385,7 +385,7 @@ class PasswordResetFormTest(TestCase): self.assertFalse(form.is_valid()) self.assertEqual(form['email'].errors, [_('Enter a valid email address.')]) - def test_nonexistant_email(self): + def test_nonexistent_email(self): """ Test nonexistent email address. This should not fail because it would expose information about registered users. diff --git a/django/contrib/gis/db/models/sql/query.py b/django/contrib/gis/db/models/sql/query.py index d5a7f819c8..7e7715c682 100644 --- a/django/contrib/gis/db/models/sql/query.py +++ b/django/contrib/gis/db/models/sql/query.py @@ -12,7 +12,7 @@ class GeoQuery(sql.Query): """ A single spatial SQL query. """ - # Overridding the valid query terms. + # Overriding the valid query terms. query_terms = QUERY_TERMS | set(GeometryField.class_lookups.keys()) aggregates_module = gis_aggregates diff --git a/django/contrib/gis/gdal/srs.py b/django/contrib/gis/gdal/srs.py index 71052b25e9..548a3cd0ea 100644 --- a/django/contrib/gis/gdal/srs.py +++ b/django/contrib/gis/gdal/srs.py @@ -1,5 +1,5 @@ """ - The Spatial Reference class, represensents OGR Spatial Reference objects. + The Spatial Reference class, represents OGR Spatial Reference objects. Example: >>> from django.contrib.gis.gdal import SpatialReference diff --git a/django/core/serializers/xml_serializer.py b/django/core/serializers/xml_serializer.py index a23e74454f..de82a969c1 100644 --- a/django/core/serializers/xml_serializer.py +++ b/django/core/serializers/xml_serializer.py @@ -187,7 +187,7 @@ class Deserializer(base.Deserializer): m2m_data = {} model_fields = Model._meta.get_all_field_names() - # Deseralize each field. + # Deserialize each field. for field_node in node.getElementsByTagName("field"): # If the field is missing the name attribute, bail (are you # sensing a pattern here?) diff --git a/django/db/models/fields/related.py b/django/db/models/fields/related.py index 69934c037a..428acd690d 100644 --- a/django/db/models/fields/related.py +++ b/django/db/models/fields/related.py @@ -1776,7 +1776,7 @@ class ForeignKey(ForeignObject): params={ 'model': self.rel.to._meta.verbose_name, 'pk': value, 'field': self.rel.field_name, 'value': value, - }, # 'pk' is included for backwards compatibilty + }, # 'pk' is included for backwards compatibility ) def get_attname(self): diff --git a/tests/admin_checks/tests.py b/tests/admin_checks/tests.py index 81f14afedd..799fc2899a 100644 --- a/tests/admin_checks/tests.py +++ b/tests/admin_checks/tests.py @@ -407,7 +407,7 @@ class SystemChecksTestCase(TestCase): errors = SongAdmin.check(model=Song) self.assertEqual(errors, []) - def test_nonexistant_field(self): + def test_nonexistent_field(self): class SongAdmin(admin.ModelAdmin): readonly_fields = ("title", "nonexistent") @@ -423,7 +423,7 @@ class SystemChecksTestCase(TestCase): ] self.assertEqual(errors, expected) - def test_nonexistant_field_on_inline(self): + def test_nonexistent_field_on_inline(self): class CityInline(admin.TabularInline): model = City readonly_fields = ['i_dont_exist'] # Missing attribute diff --git a/tests/admin_validation/tests.py b/tests/admin_validation/tests.py index a7c32ca79f..e748336e18 100644 --- a/tests/admin_validation/tests.py +++ b/tests/admin_validation/tests.py @@ -212,7 +212,7 @@ class ValidationTestCase(TestCase): warnings.filterwarnings('ignore', module='django.contrib.admin.options') SongAdmin.validate(Song) - def test_nonexistant_field(self): + def test_nonexistent_field(self): class SongAdmin(admin.ModelAdmin): readonly_fields = ("title", "nonexistent") @@ -222,7 +222,7 @@ class ValidationTestCase(TestCase): SongAdmin.validate, Song) - def test_nonexistant_field_on_inline(self): + def test_nonexistent_field_on_inline(self): class CityInline(admin.TabularInline): model = City readonly_fields = ['i_dont_exist'] # Missing attribute diff --git a/tests/admin_views/tests.py b/tests/admin_views/tests.py index 562d7573e6..d8758cd3ac 100644 --- a/tests/admin_views/tests.py +++ b/tests/admin_views/tests.py @@ -479,7 +479,7 @@ class AdminViewBasicTest(AdminViewBasicTestCase): response = self.client.get('/test_admin/%s/admin_views/thing/' % self.urlbit, {'notarealfield': '5'}) self.assertRedirects(response, '/test_admin/%s/admin_views/thing/?e=1' % self.urlbit) - # Spanning relationships through an inexistant related object (Refs #16716) + # Spanning relationships through a nonexistent related object (Refs #16716) response = self.client.get('/test_admin/%s/admin_views/thing/' % self.urlbit, {'notarealfield__whatever': '5'}) self.assertRedirects(response, '/test_admin/%s/admin_views/thing/?e=1' % self.urlbit) @@ -605,7 +605,7 @@ class AdminViewBasicTest(AdminViewBasicTestCase): self.assertEqual(response.status_code, 400) self.assertEqual(len(calls), 1) - # Specifying a field that is not refered by any other model registered + # Specifying a field that is not referred by any other model registered # to this admin site should raise an exception. with patch_logger('django.security.DisallowedModelAdminToField', 'error') as calls: response = self.client.get("/test_admin/admin/admin_views/section/", {TO_FIELD_VAR: 'name'}) @@ -624,12 +624,12 @@ class AdminViewBasicTest(AdminViewBasicTestCase): response = self.client.get("/test_admin/admin/admin_views/ingredient/", {TO_FIELD_VAR: 'id'}) self.assertEqual(response.status_code, 200) - # #23329 - Specifying a field that is not refered by any other model directly registered + # #23329 - Specifying a field that is not referred by any other model directly registered # to this admin site but registered through inheritance should be allowed. response = self.client.get("/test_admin/admin/admin_views/referencedbyparent/", {TO_FIELD_VAR: 'id'}) self.assertEqual(response.status_code, 200) - # #23431 - Specifying a field that is only refered to by a inline of a registered + # #23431 - Specifying a field that is only referred to by a inline of a registered # model should be allowed. response = self.client.get("/test_admin/admin/admin_views/referencedbyinline/", {TO_FIELD_VAR: 'id'}) self.assertEqual(response.status_code, 200) diff --git a/tests/admin_widgets/tests.py b/tests/admin_widgets/tests.py index 1617f92326..3c610d5f72 100644 --- a/tests/admin_widgets/tests.py +++ b/tests/admin_widgets/tests.py @@ -963,7 +963,7 @@ class HorizontalVerticalFilterSeleniumFirefoxTests(AdminSeleniumWebDriverTestCas str(self.jenny.id), str(self.john.id)]) # ----------------------------------------------------------------- - # Check that chosing a filtered option sends it properly to the + # Check that choosing a filtered option sends it properly to the # 'to' box. input.send_keys('a') self.assertSelectOptions(from_box, [str(self.arthur.id), str(self.jason.id)]) diff --git a/tests/backends/tests.py b/tests/backends/tests.py index be876cc089..c5c032fe05 100644 --- a/tests/backends/tests.py +++ b/tests/backends/tests.py @@ -981,7 +981,7 @@ class DBConstraintTestCase(TransactionTestCase): available_apps = ['backends'] - def test_can_reference_existant(self): + def test_can_reference_existent(self): obj = models.Object.objects.create() ref = models.ObjectReference.objects.create(obj=obj) self.assertEqual(ref.obj, obj) @@ -989,7 +989,7 @@ class DBConstraintTestCase(TransactionTestCase): ref = models.ObjectReference.objects.get(obj=obj) self.assertEqual(ref.obj, obj) - def test_can_reference_non_existant(self): + def test_can_reference_non_existent(self): self.assertFalse(models.Object.objects.filter(id=12345).exists()) ref = models.ObjectReference.objects.create(obj_id=12345) ref_new = models.ObjectReference.objects.get(obj_id=12345) diff --git a/tests/commands_sql/tests.py b/tests/commands_sql/tests.py index 83c1e06202..e9499d6b05 100644 --- a/tests/commands_sql/tests.py +++ b/tests/commands_sql/tests.py @@ -54,7 +54,7 @@ class SQLCommandsTestCase(TestCase): if 'CHECK' in statement: success = True if not success: - self.fail("'CHECK' not found in ouput %s" % output) + self.fail("'CHECK' not found in output %s" % output) def test_sql_delete(self): app_config = apps.get_app_config('commands_sql') diff --git a/tests/custom_columns/tests.py b/tests/custom_columns/tests.py index 75bba4bf12..fab77847b0 100644 --- a/tests/custom_columns/tests.py +++ b/tests/custom_columns/tests.py @@ -92,7 +92,7 @@ class CustomColumnsTests(TestCase): def test_author_get(self): self.assertEqual(self.a1, Author.objects.get(first_name__exact='John')) - def test_filter_on_nonexistant_field(self): + def test_filter_on_nonexistent_field(self): self.assertRaisesMessage( FieldError, "Cannot resolve keyword 'firstname' into field. Choices are: Author_ID, article, first_name, last_name, primary_set", diff --git a/tests/expressions/tests.py b/tests/expressions/tests.py index 1bd8d7465c..bd9eed9603 100644 --- a/tests/expressions/tests.py +++ b/tests/expressions/tests.py @@ -271,7 +271,7 @@ class ExpressionsTests(TestCase): # Another similar case for F() than above. Now we have the same join # in two filter kwargs, one in the lhs lookup, one in F. Here pre # #18375 the amount of joins generated was random if dict - # randomization was enabled, that is the generated query dependend + # randomization was enabled, that is the generated query dependent # on which clause was seen first. qs = Employee.objects.filter( company_ceo_set__num_employees=F('pk'), diff --git a/tests/model_forms/tests.py b/tests/model_forms/tests.py index 8ebc46625c..98de9c95f2 100644 --- a/tests/model_forms/tests.py +++ b/tests/model_forms/tests.py @@ -1116,7 +1116,7 @@ class ModelFormBasicTests(TestCase): self.assertEqual(f.cleaned_data['slug'], 'entertainment') self.assertEqual(f.cleaned_data['url'], 'entertainment') c1 = f.save() - # Testing wether the same object is returned from the + # Testing whether the same object is returned from the # ORM... not the fastest way... self.assertEqual(Category.objects.count(), 1) diff --git a/tests/model_inheritance/tests.py b/tests/model_inheritance/tests.py index 77210174a0..19d7b5650f 100644 --- a/tests/model_inheritance/tests.py +++ b/tests/model_inheritance/tests.py @@ -281,7 +281,7 @@ class ModelInheritanceTests(TestCase): .defer("italianrestaurant__serves_gnocchi") .order_by("rating")) - # Test that the field was actually defered + # Test that the field was actually deferred with self.assertNumQueries(2): objs = list(qs.all()) self.assertTrue(objs[1].italianrestaurant.serves_gnocchi) diff --git a/tests/schema/tests.py b/tests/schema/tests.py index acb90a37f7..42a748454a 100644 --- a/tests/schema/tests.py +++ b/tests/schema/tests.py @@ -515,7 +515,7 @@ class SchemaTests(TransactionTestCase): else: self.fail("No FK constraint for author_id found") - def test_alter_implicit_id_to_explict(self): + def test_alter_implicit_id_to_explicit(self): """ Should be able to convert an implicit "id" field to an explicit "id" primary key field. diff --git a/tests/serializers_regress/tests.py b/tests/serializers_regress/tests.py index d111a7d719..655fbe32a0 100644 --- a/tests/serializers_regress/tests.py +++ b/tests/serializers_regress/tests.py @@ -419,11 +419,11 @@ class SerializerTests(TestCase): serializers.get_serializer("nonsense") self.assertEqual(cm.exception.args, ("nonsense",)) - def test_unregister_unkown_serializer(self): + def test_unregister_unknown_serializer(self): with self.assertRaises(SerializerDoesNotExist): serializers.unregister_serializer("nonsense") - def test_get_unkown_deserializer(self): + def test_get_unknown_deserializer(self): with self.assertRaises(SerializerDoesNotExist): serializers.get_deserializer("nonsense") diff --git a/tests/signed_cookies_tests/tests.py b/tests/signed_cookies_tests/tests.py index 2601d24219..ff8fe76bf6 100644 --- a/tests/signed_cookies_tests/tests.py +++ b/tests/signed_cookies_tests/tests.py @@ -37,7 +37,7 @@ class SignedCookieTest(TestCase): self.assertRaises(signing.BadSignature, request.get_signed_cookie, 'c') - def test_default_argument_supresses_exceptions(self): + def test_default_argument_suppresses_exceptions(self): response = HttpResponse() response.set_signed_cookie('c', 'hello') request = HttpRequest() diff --git a/tests/update_only_fields/tests.py b/tests/update_only_fields/tests.py index 324fc183d4..095858fa49 100644 --- a/tests/update_only_fields/tests.py +++ b/tests/update_only_fields/tests.py @@ -73,7 +73,7 @@ class UpdateOnlyFieldsTests(TestCase): with self.assertNumQueries(1): s1.save() # Test that the deferred class does not remember that gender was - # set, instead the instace should remember this. + # set, instead the instance should remember this. s1 = Person.objects.only('name').get(pk=s.pk) with self.assertNumQueries(1): s1.save() diff --git a/tests/validation/tests.py b/tests/validation/tests.py index e1cfd64937..2a7549a461 100644 --- a/tests/validation/tests.py +++ b/tests/validation/tests.py @@ -56,7 +56,7 @@ class BaseModelValidationTests(ValidationTestCase): mtv = ModelToValidate(number=10, name='Some Name', url='not a url') self.assertFieldFailsValidationWithMessage(mtv.full_clean, 'url', ['Enter a valid URL.']) - def test_text_greater_that_charfields_max_length_raises_erros(self): + def test_text_greater_that_charfields_max_length_raises_errors(self): mtv = ModelToValidate(number=10, name='Some Name' * 100) self.assertFailsValidation(mtv.full_clean, ['name'])