queryset-refactor: Fixed a couple of differences between trunk and this 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

6 files changed, 9 insertions, 3 deletions

diff --git a/AUTHORS b/AUTHORS
index ab349fabc3..ffb9e87690 100644
--- a/AUTHORS
+++ b/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>
diff --git a/README b/README
index 084f863a1e..503949041e 100644
--- a/README
+++ b/README
@@ -34,4 +34,3 @@ To contribute to Django:
 
     * Check out http://www.djangoproject.com/community/ for information
       about getting involved.
-
diff --git a/django/conf/locale/en/LC_MESSAGES/django.mo b/django/conf/locale/en/LC_MESSAGES/django.mo
index 038e794a83..5bb3059a2c 100644
--- a/django/conf/locale/en/LC_MESSAGES/django.mo
+++ b/django/conf/locale/en/LC_MESSAGES/django.mo
diff --git a/django/conf/locale/en/LC_MESSAGES/djangojs.mo b/django/conf/locale/en/LC_MESSAGES/djangojs.mo
index b51ec1c702..41cc5b54c0 100644
--- a/django/conf/locale/en/LC_MESSAGES/djangojs.mo
+++ b/django/conf/locale/en/LC_MESSAGES/djangojs.mo
diff --git a/tests/regressiontests/forms/tests.py b/tests/regressiontests/forms/tests.py
index f8c5c486e4..bb0e30b874 100644
--- a/tests/regressiontests/forms/tests.py
+++ b/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 @@ __test__ = {
     '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,
diff --git a/tests/regressiontests/forms/util.py b/tests/regressiontests/forms/util.py
index 4f81709082..bfaf73f6bc 100644
--- a/tests/regressiontests/forms/util.py
+++ b/tests/regressiontests/forms/util.py
@@ -42,4 +42,11 @@ u''
 # 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>
 """