Django

Code

Changeset 7575

Show
Ignore:
Timestamp:
06/06/08 06:47:47 (4 months ago)
Author:
russellm
Message:

Fixed #7366 -- Modified a few expected test outputs to remove the dependency on dictionary ordering. Thanks for the patch, Leo Soto.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r7502 r7575  
    402402# The 'select' argument to extra() supports names with dashes in them, as long 
    403403# as you use values(). 
    404 >>> Article.objects.filter(pub_date__year=2008).extra(select={'dashed-value': '1'}).values('headline', 'dashed-value') 
    405 [{'headline': u'Article 11', 'dashed-value': 1}, {'headline': u'Article 12', 'dashed-value': 1}] 
     404>>> dicts = Article.objects.filter(pub_date__year=2008).extra(select={'dashed-value': '1'}).values('headline', 'dashed-value') 
     405>>> [sorted(d.items()) for d in dicts] 
     406[[('dashed-value', 1), ('headline', u'Article 11')], [('dashed-value', 1), ('headline', u'Article 12')]] 
    406407 
    407408# If you use 'select' with extra() and names containing dashes on a query 

  • django/trunk/tests/modeltests/or_lookups/models.py

    r7477 r7575  
    1111113 
    112112 
    113 >>> list(Article.objects.filter(Q(headline__startswith='Hello'), Q(headline__contains='bye')).values()) 
    114 [{'headline': u'Hello and goodbye', 'pub_date': datetime.datetime(2005, 11, 29, 0, 0), 'id': 3}] 
     113>>> dicts = list(Article.objects.filter(Q(headline__startswith='Hello'), Q(headline__contains='bye')).values()) 
     114>>> [sorted(d.items()) for d in dicts] 
     115[[('headline', u'Hello and goodbye'), ('id', 3), ('pub_date', datetime.datetime(2005, 11, 29, 0, 0))]] 
    115116 
    116117>>> Article.objects.filter(Q(headline__startswith='Hello')).in_bulk([1,2]) 

  • django/trunk/tests/regressiontests/defaultfilters/tests.py

    r6892 r7575  
    227227u'some html with alert("You smell") disallowed  tags' 
    228228 
    229 >>> dictsort([{'age': 23, 'name': 'Barbara-Ann'}, 
    230 ...           {'age': 63, 'name': 'Ra Ra Rasputin'}, 
    231 ...           {'name': 'Jonny B Goode', 'age': 18}], 'age') 
    232 [{'age': 18, 'name': 'Jonny B Goode'}, {'age': 23, 'name': 'Barbara-Ann'}, {'age': 63, 'name': 'Ra Ra Rasputin'}] 
    233  
    234 >>> dictsortreversed([{'age': 23, 'name': 'Barbara-Ann'}, 
    235 ...           {'age': 63, 'name': 'Ra Ra Rasputin'}, 
    236 ...           {'name': 'Jonny B Goode', 'age': 18}], 'age') 
    237 [{'age': 63, 'name': 'Ra Ra Rasputin'}, {'age': 23, 'name': 'Barbara-Ann'}, {'age': 18, 'name': 'Jonny B Goode'}] 
     229>>> sorted_dicts = dictsort([{'age': 23, 'name': 'Barbara-Ann'}, 
     230...                          {'age': 63, 'name': 'Ra Ra Rasputin'}, 
     231...                          {'name': 'Jonny B Goode', 'age': 18}], 'age') 
     232>>> [sorted(dict.items()) for dict in sorted_dicts] 
     233[[('age', 18), ('name', 'Jonny B Goode')], [('age', 23), ('name', 'Barbara-Ann')], [('age', 63), ('name', 'Ra Ra Rasputin')]] 
     234 
     235>>> sorted_dicts = dictsortreversed([{'age': 23, 'name': 'Barbara-Ann'}, 
     236...                                  {'age': 63, 'name': 'Ra Ra Rasputin'}, 
     237...                                  {'name': 'Jonny B Goode', 'age': 18}], 'age') 
     238>>> [sorted(dict.items()) for dict in sorted_dicts] 
     239[[('age', 63), ('name', 'Ra Ra Rasputin')], [('age', 23), ('name', 'Barbara-Ann')], [('age', 18), ('name', 'Jonny B Goode')]] 
    238240 
    239241>>> first([0,1,2]) 

  • django/trunk/tests/regressiontests/queries/models.py

    r7501 r7575  
    504504# Despite having some extra aliases in the query, we can still omit them in a 
    505505# values() query. 
    506 >>> qs.values('id', 'rank').order_by('id') 
    507 [{'id': 1, 'rank': 2}, {'id': 2, 'rank': 1}, {'id': 3, 'rank': 3}] 
     506>>> dicts = qs.values('id', 'rank').order_by('id') 
     507>>> [sorted(d.items()) for d in dicts] 
     508[[('id', 1), ('rank', 2)], [('id', 2), ('rank', 1)], [('id', 3), ('rank', 3)]] 
    508509 
    509510Bugs #2874, #3002