diff options
| author | Tim Graham <timograham@gmail.com> | 2017-02-02 20:43:21 -0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2017-02-03 08:01:45 -0500 |
| commit | 29f607927fe82e2c8baab171dfa8baf710cd9b83 (patch) | |
| tree | f525c6c4784ccafe77e01f706093fa6f4a5c9481 /django | |
| parent | a21ec12409a5b72d602cd03ee925b6ceb1cd5492 (diff) | |
Fixed spelling of "nonexistent".
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/admin/options.py | 2 | ||||
| -rw-r--r-- | django/contrib/auth/backends.py | 2 | ||||
| -rw-r--r-- | django/contrib/contenttypes/fields.py | 6 | ||||
| -rw-r--r-- | django/core/cache/backends/memcached.py | 4 | ||||
| -rw-r--r-- | django/db/models/base.py | 6 | ||||
| -rw-r--r-- | django/db/models/query.py | 2 |
6 files changed, 12 insertions, 10 deletions
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index ff6aa94be4..ba7e36c8c2 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -352,7 +352,7 @@ class BaseModelAdmin(metaclass=forms.MediaDefiningClass): try: field = model._meta.get_field(part) except FieldDoesNotExist: - # Lookups on non-existent fields are ok, since they're ignored + # Lookups on nonexistent fields are ok, since they're ignored # later. break # It is allowed to filter on values that would be found from local diff --git a/django/contrib/auth/backends.py b/django/contrib/auth/backends.py index e0fbd21b38..64f9af38ba 100644 --- a/django/contrib/auth/backends.py +++ b/django/contrib/auth/backends.py @@ -16,7 +16,7 @@ class ModelBackend: user = UserModel._default_manager.get_by_natural_key(username) except UserModel.DoesNotExist: # Run the default password hasher once to reduce the timing - # difference between an existing and a non-existing user (#20760). + # difference between an existing and a nonexistent user (#20760). UserModel().set_password(password) else: if user.check_password(password) and self.user_can_authenticate(user): diff --git a/django/contrib/contenttypes/fields.py b/django/contrib/contenttypes/fields.py index c2b46d1254..df6113f462 100644 --- a/django/contrib/contenttypes/fields.py +++ b/django/contrib/contenttypes/fields.py @@ -97,7 +97,8 @@ class GenericForeignKey: except FieldDoesNotExist: return [ checks.Error( - "The GenericForeignKey object ID references the non-existent field '%s'." % self.fk_field, + "The GenericForeignKey object ID references the " + "nonexistent field '%s'." % self.fk_field, obj=self, id='contenttypes.E001', ) @@ -115,7 +116,8 @@ class GenericForeignKey: except FieldDoesNotExist: return [ checks.Error( - "The GenericForeignKey content type references the non-existent field '%s.%s'." % ( + "The GenericForeignKey content type references the " + "nonexistent field '%s.%s'." % ( self.model._meta.object_name, self.ct_field ), obj=self, diff --git a/django/core/cache/backends/memcached.py b/django/core/cache/backends/memcached.py index 6be2378e56..8f87f487bf 100644 --- a/django/core/cache/backends/memcached.py +++ b/django/core/cache/backends/memcached.py @@ -108,7 +108,7 @@ class BaseMemcachedCache(BaseCache): try: val = self._cache.incr(key, delta) - # python-memcache responds to incr on non-existent keys by + # python-memcache responds to incr on nonexistent keys by # raising a ValueError, pylibmc by raising a pylibmc.NotFound # and Cmemcache returns None. In all cases, # we should raise a ValueError though. @@ -126,7 +126,7 @@ class BaseMemcachedCache(BaseCache): try: val = self._cache.decr(key, delta) - # python-memcache responds to incr on non-existent keys by + # python-memcache responds to incr on nonexistent keys by # raising a ValueError, pylibmc by raising a pylibmc.NotFound # and Cmemcache returns None. In all cases, # we should raise a ValueError though. diff --git a/django/db/models/base.py b/django/db/models/base.py index 497a18f51a..2914ba2a6f 100644 --- a/django/db/models/base.py +++ b/django/db/models/base.py @@ -1497,7 +1497,7 @@ class Model(metaclass=ModelBase): except KeyError: errors.append( checks.Error( - "'%s' refers to the non-existent field '%s'." % ( + "'%s' refers to the nonexistent field '%s'." % ( option, field_name, ), obj=cls, @@ -1570,7 +1570,7 @@ class Model(metaclass=ModelBase): # but is an alias and therefore won't be found by opts.get_field. fields = {f for f in fields if f != 'pk'} - # Check for invalid or non-existent fields in ordering. + # Check for invalid or nonexistent fields in ordering. invalid_fields = [] # Any field name that is not present in field_names does not exist. @@ -1586,7 +1586,7 @@ class Model(metaclass=ModelBase): for invalid_field in invalid_fields: errors.append( checks.Error( - "'ordering' refers to the non-existent field '%s'." % invalid_field, + "'ordering' refers to the nonexistent field '%s'." % invalid_field, obj=cls, id='models.E015', ) diff --git a/django/db/models/query.py b/django/db/models/query.py index 244cfaf164..290be2e779 100644 --- a/django/db/models/query.py +++ b/django/db/models/query.py @@ -1267,7 +1267,7 @@ class RawQuerySet: index = columns.index(query_name) columns[index] = model_name except ValueError: - # Ignore translations for non-existent column names + # Ignore translations for nonexistent column names pass return columns |
