Django

Code

Show
Ignore:
Timestamp:
03/22/08 14:20:19 (10 months ago)
Author:
jkocherhans
Message:

newforms-admin: Merged from trunk up to [7350].

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • django/branches/newforms-admin

    • Property svnmerge-integrated changed from /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-7232 to /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-7350
  • django/branches/newforms-admin/django/template/debug.py

    • Property svn:eol-style set to native
    r7022 r7351  
    7676        except Exception, e: 
    7777            from sys import exc_info 
    78             wrapped = TemplateSyntaxError('Caught an exception while rendering: %s' % e
     78            wrapped = TemplateSyntaxError(u'Caught an exception while rendering: %s' % force_unicode(e, errors='replace')
    7979            wrapped.source = node.source 
    8080            wrapped.exc_info = exc_info()