Django

Code

Changeset 2392

Show
Ignore:
Timestamp:
02/25/06 11:24:17 (3 years ago)
Author:
adrian
Message:

Changed get_object() not to use 'ordering' parameter from the model. Thanks, Ned Batchelder. Also updated some unit tests to show correct DoesNotExist? output

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/core/meta/__init__.py

    r2391 r2392  
    13531353 
    13541354def function_get_object(opts, klass, does_not_exist_exception, **kwargs): 
     1355    kwargs['order_by'] = kwargs.get('order_by', ()) 
    13551356    obj_list = function_get_list(opts, klass, **kwargs) 
    13561357    if len(obj_list) < 1: 

  • django/trunk/tests/testapp/models/basic.py

    r1546 r2392  
    6868Traceback (most recent call last): 
    6969    ... 
    70 ArticleDoesNotExist: Article does not exist for {'id__exact': 2} 
     70ArticleDoesNotExist: Article does not exist for {'order_by': (), 'id__exact': 2} 
    7171 
    7272>>> articles.get_object(pub_date__year=2005, pub_date__month=8) 

  • django/trunk/tests/testapp/models/custom_pk.py

    r991 r2392  
    4646Traceback (most recent call last): 
    4747    ... 
    48 EmployeeDoesNotExist: Employee does not exist for {'pk': 'foo'} 
     48EmployeeDoesNotExist: Employee does not exist for {'pk': 'foo', 'order_by': ()} 
    4949 
    5050# Fran got married and changed her last name. 

  • django/trunk/tests/testapp/models/one_to_one.py

    r1325 r2392  
    5454Traceback (most recent call last): 
    5555    ... 
    56 RestaurantDoesNotExist: Restaurant does not exist for {'place__id__exact': ...} 
     56RestaurantDoesNotExist: Restaurant does not exist for {'order_by': (), 'place__id__exact': ...} 
    5757 
    5858# restaurants.get_list() just returns the Restaurants, not the Places.