diff options
Diffstat (limited to 'django/db/models/query.py')
| -rw-r--r-- | django/db/models/query.py | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/django/db/models/query.py b/django/db/models/query.py index 3226f38753..48d295ccca 100644 --- a/django/db/models/query.py +++ b/django/db/models/query.py @@ -150,10 +150,10 @@ class QuerySet(object): """ if not isinstance(k, (slice,) + six.integer_types): raise TypeError - assert ((not isinstance(k, slice) and (k >= 0)) - or (isinstance(k, slice) and (k.start is None or k.start >= 0) - and (k.stop is None or k.stop >= 0))), \ - "Negative indexing is not supported." + assert ((not isinstance(k, slice) and (k >= 0)) or + (isinstance(k, slice) and (k.start is None or k.start >= 0) and + (k.stop is None or k.stop >= 0))), \ + "Negative indexing is not supported." if self._result_cache is not None: return self._result_cache[k] @@ -521,7 +521,7 @@ class QuerySet(object): that ID. """ assert self.query.can_filter(), \ - "Cannot use 'limit' or 'offset' with in_bulk" + "Cannot use 'limit' or 'offset' with in_bulk" if not id_list: return {} qs = self.filter(pk__in=id_list).order_by() @@ -532,7 +532,7 @@ class QuerySet(object): Deletes the records in the current QuerySet. """ assert self.query.can_filter(), \ - "Cannot use 'limit' or 'offset' with delete." + "Cannot use 'limit' or 'offset' with delete." del_query = self._clone() @@ -569,7 +569,7 @@ class QuerySet(object): fields to the appropriate values. """ assert self.query.can_filter(), \ - "Cannot update a query once a slice has been taken." + "Cannot update a query once a slice has been taken." self._for_write = True query = self.query.clone(sql.UpdateQuery) query.add_update_values(kwargs) @@ -587,7 +587,7 @@ class QuerySet(object): useful at that level). """ assert self.query.can_filter(), \ - "Cannot update a query once a slice has been taken." + "Cannot update a query once a slice has been taken." query = self.query.clone(sql.UpdateQuery) query.add_update_fields(values) self._result_cache = None @@ -635,11 +635,11 @@ class QuerySet(object): the given field_name, scoped to 'kind'. """ assert kind in ("year", "month", "day"), \ - "'kind' must be one of 'year', 'month' or 'day'." + "'kind' must be one of 'year', 'month' or 'day'." assert order in ('ASC', 'DESC'), \ - "'order' must be either 'ASC' or 'DESC'." + "'order' must be either 'ASC' or 'DESC'." return self._clone(klass=DateQuerySet, setup=True, - _field_name=field_name, _kind=kind, _order=order) + _field_name=field_name, _kind=kind, _order=order) def datetimes(self, field_name, kind, order='ASC', tzinfo=None): """ @@ -647,9 +647,9 @@ class QuerySet(object): datetimes for the given field_name, scoped to 'kind'. """ assert kind in ("year", "month", "day", "hour", "minute", "second"), \ - "'kind' must be one of 'year', 'month', 'day', 'hour', 'minute' or 'second'." + "'kind' must be one of 'year', 'month', 'day', 'hour', 'minute' or 'second'." assert order in ('ASC', 'DESC'), \ - "'order' must be either 'ASC' or 'DESC'." + "'order' must be either 'ASC' or 'DESC'." if settings.USE_TZ: if tzinfo is None: tzinfo = timezone.get_current_timezone() @@ -804,7 +804,7 @@ class QuerySet(object): Returns a new QuerySet instance with the ordering changed. """ assert self.query.can_filter(), \ - "Cannot reorder a query once a slice has been taken." + "Cannot reorder a query once a slice has been taken." obj = self._clone() obj.query.clear_ordering(force_empty=False) obj.query.add_ordering(*field_names) @@ -815,7 +815,7 @@ class QuerySet(object): Returns a new QuerySet instance that will select only distinct results. """ assert self.query.can_filter(), \ - "Cannot create distinct fields once a slice has been taken." + "Cannot create distinct fields once a slice has been taken." obj = self._clone() obj.query.add_distinct_fields(*field_names) return obj @@ -826,7 +826,7 @@ class QuerySet(object): Adds extra SQL fragments to the query. """ assert self.query.can_filter(), \ - "Cannot change a query once a slice has been taken" + "Cannot change a query once a slice has been taken" clone = self._clone() clone.query.add_extra(select, select_params, where, params, tables, order_by) return clone |