diff options
| author | Loic Bistuer <loic.bistuer@sixmedia.com> | 2013-12-13 03:23:24 +0700 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2013-12-14 11:59:15 -0500 |
| commit | 668571386926ff5453d0e11f59b0a89c0dc1dfa2 (patch) | |
| tree | ab2cf4f5c32d966452ef01eee93c09642f769b6a /django/db/models/sql/query.py | |
| parent | d599b590ebe6e2d3a60cf033de4d81c6b963bb04 (diff) | |
Fixed E127 pep8 warnings.
Diffstat (limited to 'django/db/models/sql/query.py')
| -rw-r--r-- | django/db/models/sql/query.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py index db1a630a66..43026d2d82 100644 --- a/django/db/models/sql/query.py +++ b/django/db/models/sql/query.py @@ -452,9 +452,9 @@ class Query(object): 'rhs' query. """ assert self.model == rhs.model, \ - "Cannot combine queries on two different base models." + "Cannot combine queries on two different base models." assert self.can_filter(), \ - "Cannot combine queries once a slice has been taken." + "Cannot combine queries once a slice has been taken." assert self.distinct == rhs.distinct, \ "Cannot combine a unique query with a non-unique query." assert self.distinct_fields == rhs.distinct_fields, \ |