mirror of
https://github.com/django/django.git
synced 2025-07-05 18:29:11 +00:00
queryset-refactor: People are getting picky about my spelling.
git-svn-id: http://code.djangoproject.com/svn/django/branches/queryset-refactor@7346 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
0187f53f09
commit
570c12aeb8
@ -120,7 +120,7 @@ class _QuerySet(object):
|
|||||||
|
|
||||||
def _merge_sanity_check(self, other):
|
def _merge_sanity_check(self, other):
|
||||||
"""
|
"""
|
||||||
Checks that we are merging two comparable queyrset classes.
|
Checks that we are merging two comparable queryset classes.
|
||||||
"""
|
"""
|
||||||
if self.__class__ is not other.__class__:
|
if self.__class__ is not other.__class__:
|
||||||
raise TypeError("Cannot merge querysets of different types ('%s' and '%s'."
|
raise TypeError("Cannot merge querysets of different types ('%s' and '%s'."
|
||||||
|
Loading…
x
Reference in New Issue
Block a user