Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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
@malcolmt malcolmt authored
View
2  AUTHORS
@@ -254,7 +254,6 @@ answer newbie questions, and generally made Django that much better:
phil@produxion.net
phil.h.smith@gmail.com
Gustavo Picon
- pigletto
Luke Plant <http://lukeplant.me.uk/>
plisk
Mihai Preda <mihai_preda@yahoo.com>
@@ -335,7 +334,6 @@ answer newbie questions, and generally made Django that much better:
wam-djangobug@wamber.net
Wang Chun <wangchun@exoweb.net>
Filip Wasilewski <filip.wasilewski@gmail.com>
- Filip Wasilewski <filip.wasilewski@gmail.com>
Dan Watson <http://theidioteque.net/>
Chris Wesseling <Chris.Wesseling@cwi.nl>
James Wheare <django@sparemint.com>
View
1  README
@@ -34,4 +34,3 @@ To contribute to Django:
* Check out http://www.djangoproject.com/community/ for information
about getting involved.
-
View
BIN  django/conf/locale/en/LC_MESSAGES/django.mo
Binary file not shown
View
BIN  django/conf/locale/en/LC_MESSAGES/djangojs.mo
Binary file not shown
View
2  tests/regressiontests/forms/tests.py
@@ -2,6 +2,7 @@
from extra import tests as extra_tests
from fields import tests as fields_tests
from forms import tests as form_tests
+from error_messages import tests as custom_error_message_tests
from localflavor.ar import tests as localflavor_ar_tests
from localflavor.au import tests as localflavor_au_tests
from localflavor.br import tests as localflavor_br_tests
@@ -30,6 +31,7 @@
'extra_tests': extra_tests,
'fields_tests': fields_tests,
'form_tests': form_tests,
+ 'custom_error_message_tests': custom_error_message_tests,
'localflavor_ar_tests': localflavor_ar_tests,
'localflavor_au_tests': localflavor_au_tests,
'localflavor_br_tests': localflavor_br_tests,
View
7 tests/regressiontests/forms/util.py
@@ -42,4 +42,11 @@
# Can take a mixture in a list.
>>> print ValidationError(["First error.", u"Not \u03C0.", ugettext_lazy("Error.")]).messages
<ul class="errorlist"><li>First error.</li><li>Not π.</li><li>Error.</li></ul>
+
+>>> class VeryBadError:
+... def __unicode__(self): return u"A very bad error."
+
+# Can take a non-string.
+>>> print ValidationError(VeryBadError()).messages
+<ul class="errorlist"><li>A very bad error.</li></ul>
"""
Please sign in to comment.
Something went wrong with that request. Please try again.