Django

Code

Changeset 2393

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

magic-removal: Merged to [2392]

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/magic-removal/django/db/models/query.py

    r2381 r2393  
    164164    def get(self, *args, **kwargs): 
    165165        "Performs the SELECT and returns a single object matching the given keyword arguments." 
    166         obj_list = list(self.filter(*args, **kwargs)) 
     166        clone = self.filter(*args, **kwargs) 
     167        if not clone._order_by: 
     168            clone._order_by = () 
     169        obj_list = list(clone) 
    167170        if len(obj_list) < 1: 
    168171            raise self.model.DoesNotExist, "%s does not exist for %s" % (self.model._meta.object_name, kwargs) 
    …… 
    651654            join_column = field.m2m_reverse_name() 
    652655            intermediate_column = field.m2m_column_name() 
    653              
     656 
    654657            raise FieldFound 
    655658 
    …… 
    668671            join_column = field.field.m2m_column_name() 
    669672            intermediate_column = field.field.m2m_reverse_name() 
    670              
     673 
    671674            raise FieldFound 
    672675 

  • django/branches/magic-removal/tests/othertests/defaultfilters.py

    r2388 r2393  
    238238'1 day' 
    239239 
    240 # datetime.date compataibility with timesince 
    241 >>> timesince(datetime.date.today() - datetime.timedelta(1)) 
    242 '1 day, 23 hours' 
    243  
    244240>>> default("val", "default") 
    245241'val'