Django

Code

Changeset 7245

Show
Ignore:
Timestamp:
03/14/08 21:25:46 (8 months ago)
Author:
mtredinnick
Message:

queryset-refactor: The EmptyResultSet? exception was declared in two places.
Removed one of them.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/queryset-refactor/django/db/models/query.py

    r7240 r7245  
    33from django.db import connection, transaction 
    44from django.db.models.fields import DateField, FieldDoesNotExist 
    5 from django.db.models.query_utils import Q, EmptyResultSet, not_q 
     5from django.db.models.query_utils import Q, not_q 
    66from django.db.models import signals, sql 
    77from django.dispatch import dispatcher 
    …… 
    1212CHUNK_SIZE = 100 
    1313ITER_CHUNK_SIZE = CHUNK_SIZE 
     14 
     15# Pull into this namespace for backwards compatibility 
     16EmptyResultSet = sql.EmptyResultSet 
    1417 
    1518class _QuerySet(object): 

  • django/branches/queryset-refactor/django/db/models/query_utils.py

    r7244 r7245  
    99 
    1010from django.utils import tree 
    11  
    12 class EmptyResultSet(Exception): 
    13     """ 
    14     Raised when a QuerySet cannot contain any data. 
    15     """ 
    16     pass 
    1711 
    1812class QueryWrapper(object): 

  • django/branches/queryset-refactor/django/db/models/sql/__init__.py

    r7164 r7245  
    22from subqueries import * 
    33from where import AND, OR 
     4from datastructures import EmptyResultSet 
    45 
    5 __all__ = ['Query', 'AND', 'OR'] 
     6__all__ = ['Query', 'AND', 'OR', 'EmptyResultSet'] 
    67