From e27a7ef360af84f319b32007be369819044bd05c Mon Sep 17 00:00:00 2001
From: Malcolm Tredinnick <malcolm.tredinnick@gmail.com>
Date: Fri, 13 Jul 2007 10:56:30 +0000
Subject: [PATCH] =?UTF-8?q?Fixed=20#4842=20--=20Added=20slightly=20more=20?=
 =?UTF-8?q?robust=20error=20reporting.=20Thanks,=20Thomas=20G=C3=BCttler.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://code.djangoproject.com/svn/django/trunk@5682 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 django/template/defaultfilters.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/django/template/defaultfilters.py b/django/template/defaultfilters.py
index 6aadbf2381..6779b9b5f2 100644
--- a/django/template/defaultfilters.py
+++ b/django/template/defaultfilters.py
@@ -556,7 +556,7 @@ def pprint(value):
     try:
         return pformat(value)
     except Exception, e:
-        return u"Error in formatting:%s" % force_unicode(e)
+        return u"Error in formatting: %s" % force_unicode(e, errors="replace")
 
 # Syntax: register.filter(name of filter, callback)
 register.filter(add)