Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

queryset-refactor: Fixed a couple of differences between trunk and th…

…is branch that were caused by merge errors.

git-svn-id: http://code.djangoproject.com/svn/django/branches/queryset-refactor@6896 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 3dce17ddc4a891856a0831f5f26716675d7a3bab 1 parent 0d7b688
Malcolm Tredinnick authored December 05, 2007
2  AUTHORS
@@ -254,7 +254,6 @@ answer newbie questions, and generally made Django that much better:
254 254
     phil@produxion.net
255 255
     phil.h.smith@gmail.com
256 256
     Gustavo Picon
257  
-    pigletto
258 257
     Luke Plant <http://lukeplant.me.uk/>
259 258
     plisk
260 259
     Mihai Preda <mihai_preda@yahoo.com>
@@ -335,7 +334,6 @@ answer newbie questions, and generally made Django that much better:
335 334
     wam-djangobug@wamber.net
336 335
     Wang Chun <wangchun@exoweb.net>
337 336
     Filip Wasilewski <filip.wasilewski@gmail.com>
338  
-    Filip Wasilewski <filip.wasilewski@gmail.com>
339 337
     Dan Watson <http://theidioteque.net/>
340 338
     Chris Wesseling <Chris.Wesseling@cwi.nl>
341 339
     James Wheare <django@sparemint.com>
1  README
@@ -34,4 +34,3 @@ To contribute to Django:
34 34
 
35 35
     * Check out http://www.djangoproject.com/community/ for information
36 36
       about getting involved.
37  
-
BIN  django/conf/locale/en/LC_MESSAGES/django.mo
Binary file not shown
BIN  django/conf/locale/en/LC_MESSAGES/djangojs.mo
Binary file not shown
2  tests/regressiontests/forms/tests.py
@@ -2,6 +2,7 @@
2 2
 from extra import tests as extra_tests
3 3
 from fields import tests as fields_tests
4 4
 from forms import tests as form_tests
  5
+from error_messages import tests as custom_error_message_tests
5 6
 from localflavor.ar import tests as localflavor_ar_tests
6 7
 from localflavor.au import tests as localflavor_au_tests
7 8
 from localflavor.br import tests as localflavor_br_tests
@@ -30,6 +31,7 @@
30 31
     'extra_tests': extra_tests,
31 32
     'fields_tests': fields_tests,
32 33
     'form_tests': form_tests,
  34
+    'custom_error_message_tests': custom_error_message_tests,
33 35
     'localflavor_ar_tests': localflavor_ar_tests,
34 36
     'localflavor_au_tests': localflavor_au_tests,
35 37
     'localflavor_br_tests': localflavor_br_tests,
7  tests/regressiontests/forms/util.py
@@ -42,4 +42,11 @@
42 42
 # Can take a mixture in a list.
43 43
 >>> print ValidationError(["First error.", u"Not \u03C0.", ugettext_lazy("Error.")]).messages
44 44
 <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>
45 52
 """

0 notes on commit 3dce17d

Please sign in to comment.
Something went wrong with that request. Please try again.