diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-05-28 17:39:14 -0700 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-05-28 17:39:14 -0700 |
| commit | 1dcc603efff8229838f27019668d864a0bcbfa59 (patch) | |
| tree | 8c67764f440faeb095143498383ca57ecd4f09be /django/db | |
| parent | e79725cdf90e3271626ed66f70b63640d3fcc521 (diff) | |
Fixed several typos in Django
Diffstat (limited to 'django/db')
| -rw-r--r-- | django/db/models/options.py | 2 | ||||
| -rw-r--r-- | django/db/models/query.py | 2 | ||||
| -rw-r--r-- | django/db/models/sql/query.py | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/django/db/models/options.py b/django/db/models/options.py index 4f04746200..632c71f3f9 100644 --- a/django/db/models/options.py +++ b/django/db/models/options.py @@ -542,7 +542,7 @@ class Options(object): """ Returns a list of parent classes leading to 'model' (order from closet to most distant ancestor). This has to handle the case were 'model' is - a granparent or even more distant relation. + a grandparent or even more distant relation. """ if not self.parents: return None diff --git a/django/db/models/query.py b/django/db/models/query.py index f2defa2100..f314fcd553 100644 --- a/django/db/models/query.py +++ b/django/db/models/query.py @@ -1780,7 +1780,7 @@ def prefetch_related_objects(result_cache, related_lookups): # Last one, this *must* resolve to something that supports # prefetching, otherwise there is no point adding it and the # developer asking for it has made a mistake. - raise ValueError("'%s' does not resolve to a item that supports " + raise ValueError("'%s' does not resolve to an item that supports " "prefetching - this is an invalid parameter to " "prefetch_related()." % lookup.prefetch_through) diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py index cb94989a05..6421f38796 100644 --- a/django/db/models/sql/query.py +++ b/django/db/models/sql/query.py @@ -1491,7 +1491,7 @@ class Query(object): query.remove_inherited_models() # Add extra check to make sure the selected field will not be null - # since we are adding a IN <subquery> clause. This prevents the + # since we are adding an IN <subquery> clause. This prevents the # database from tripping over IN (...,NULL,...) selects and returning # nothing alias, col = query.select[0].col @@ -2091,7 +2091,7 @@ class JoinPromoter(object): # join. # Note that in this example we could just as well have the __gte # clause and the OR clause swapped. Or we could replace the __gte - # clause with a OR clause containing rel_a__col=1|rel_a__col=2, + # clause with an OR clause containing rel_a__col=1|rel_a__col=2, # and again we could safely demote to INNER. query.promote_joins(to_promote) query.demote_joins(to_demote) |
