Django

Code

Changeset 6896

Show
Ignore:
Timestamp:
12/05/07 03:40:16 (1 year ago)
Author:
mtredinnick
Message:

queryset-refactor: Fixed a couple of differences between trunk and this branch that were caused by merge errors.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/queryset-refactor/AUTHORS

    r6857 r6896  
    255255    phil.h.smith@gmail.com 
    256256    Gustavo Picon 
    257     pigletto 
    258257    Luke Plant <http://lukeplant.me.uk/> 
    259258    plisk 
    …… 
    336335    Wang Chun <wangchun@exoweb.net> 
    337336    Filip Wasilewski <filip.wasilewski@gmail.com> 
    338     Filip Wasilewski <filip.wasilewski@gmail.com> 
    339337    Dan Watson <http://theidioteque.net/> 
    340338    Chris Wesseling <Chris.Wesseling@cwi.nl> 

  • django/branches/queryset-refactor/README

    r3776 r6896  
    3535    * Check out http://www.djangoproject.com/community/ for information 
    3636      about getting involved. 
    37  

  • django/branches/queryset-refactor/tests/regressiontests/forms/tests.py

    r6857 r6896  
    33from fields import tests as fields_tests 
    44from forms import tests as form_tests 
     5from error_messages import tests as custom_error_message_tests 
    56from localflavor.ar import tests as localflavor_ar_tests 
    67from localflavor.au import tests as localflavor_au_tests 
    …… 
    3132    'fields_tests': fields_tests, 
    3233    'form_tests': form_tests, 
     34    'custom_error_message_tests': custom_error_message_tests, 
    3335    'localflavor_ar_tests': localflavor_ar_tests, 
    3436    'localflavor_au_tests': localflavor_au_tests, 

  • django/branches/queryset-refactor/tests/regressiontests/forms/util.py

    r6382 r6896  
    4343>>> print ValidationError(["First error.", u"Not \u03C0.", ugettext_lazy("Error.")]).messages 
    4444<ul class="errorlist"><li>First error.</li><li>Not π.</li><li>Error.</li></ul> 
     45 
     46>>> class VeryBadError: 
     47...     def __unicode__(self): return u"A very bad error." 
     48 
     49# Can take a non-string. 
     50>>> print ValidationError(VeryBadError()).messages 
     51<ul class="errorlist"><li>A very bad error.</li></ul> 
    4552"""