Django

Code

Changeset 5154

Show
Ignore:
Timestamp:
05/05/07 23:12:08 (1 year ago)
Author:
adrian
Message:

Fixed comma splice in error message introduced in [5133]

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • django/trunk/django/db/models/query.py

    r5133 r5154  
    949949            field_choices(current_opts.get_all_related_objects(), True) + \ 
    950950            field_choices(current_opts.fields, False) 
    951         raise TypeError, "Cannot resolve keyword '%s' into field, choices are: %s" % (name, ", ".join(choices)) 
     951        raise TypeError, "Cannot resolve keyword '%s' into field. Choices are: %s" % (name, ", ".join(choices)) 
    952952 
    953953    # Check whether an intermediate join is required between current_table 
  • django/trunk/tests/modeltests/custom_columns/models.py

    r5133 r5154  
    7272Traceback (most recent call last): 
    7373    ... 
    74 TypeError: Cannot resolve keyword 'firstname' into field, choices are: article, id, first_name, last_name 
     74TypeError: Cannot resolve keyword 'firstname' into field. Choices are: article, id, first_name, last_name 
    7575 
    7676>>> a = Author.objects.get(last_name__exact='Smith') 
  • django/trunk/tests/modeltests/lookup/models.py

    r5133 r5154  
    224224Traceback (most recent call last): 
    225225    ... 
    226 TypeError: Cannot resolve keyword 'pub_date_year' into field, choices are: id, headline, pub_date 
     226TypeError: Cannot resolve keyword 'pub_date_year' into field. Choices are: id, headline, pub_date 
    227227 
    228228>>> Article.objects.filter(headline__starts='Article') 
    229229Traceback (most recent call last): 
    230230    ... 
    231 TypeError: Cannot resolve keyword 'headline__starts' into field, choices are: id, headline, pub_date 
     231TypeError: Cannot resolve keyword 'headline__starts' into field. Choices are: id, headline, pub_date 
    232232 
    233233"""} 
  • django/trunk/tests/modeltests/many_to_one/models.py

    r5133 r5154  
    175175Traceback (most recent call last): 
    176176    ... 
    177 TypeError: Cannot resolve keyword 'reporter_id' into field, choices are: id, headline, pub_date, reporter 
     177TypeError: Cannot resolve keyword 'reporter_id' into field. Choices are: id, headline, pub_date, reporter 
    178178 
    179179# You need to specify a comparison clause 
     
    181181Traceback (most recent call last): 
    182182    ... 
    183 TypeError: Cannot resolve keyword 'reporter_id' into field, choices are: id, headline, pub_date, reporter 
     183TypeError: Cannot resolve keyword 'reporter_id' into field. Choices are: id, headline, pub_date, reporter 
    184184 
    185185# You can also instantiate an Article by passing 
  • django/trunk/tests/modeltests/reverse_lookup/models.py

    r5133 r5154  
    5656Traceback (most recent call last): 
    5757    ... 
    58 TypeError: Cannot resolve keyword 'choice' into field, choices are: poll_choice, related_choice, id, question, creator 
     58TypeError: Cannot resolve keyword 'choice' into field. Choices are: poll_choice, related_choice, id, question, creator 
    5959"""} 
  • django/trunk/tests/regressiontests/null_queries/models.py

    r5133 r5154  
    3333Traceback (most recent call last): 
    3434... 
    35 TypeError: Cannot resolve keyword 'foo' into field, choices are: id, poll, choice 
     35TypeError: Cannot resolve keyword 'foo' into field. Choices are: id, poll, choice 
    3636 
    3737# Can't use None on anything other than __exact