Navigation

util.py

Timestamp:

11/29/07 23:50:44 (1 year ago)

Author:

jkocherhans

Message:

newforms-admin: Merged trunk revision [6671].

Files:

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-6655,6658-6670 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-6655,6658-6671

r6656	r6776
2	2	from django.utils.encoding import smart_unicode, StrAndUnicode, force_unicode
3	3	from django.utils.functional import Promise
	4	from django.utils.safestring import mark_safe
4	5
5	6	def flatatt(attrs):
…	…
23	24	def as_ul(self):
24	25	if not self: return u''
25		return u'<ul class="errorlist">%s</ul>' % ''.join([u'<li>%s%s</li>' % (k, force_unicode(v)) for k, v in self.items()])
	26	return mark_safe(u'<ul class="errorlist">%s</ul>'
	27	% ''.join([u'<li>%s%s</li>' % (k, force_unicode(v))
	28	for k, v in self.items()]))
26	29
27	30	def as_text(self):
…	…
37	40	def as_ul(self):
38	41	if not self: return u''
39		return u'<ul class="errorlist">%s</ul>' % ''.join([u'<li>%s</li>' % force_unicode(e) for e in self])
	42	return mark_safe(u'<ul class="errorlist">%s</ul>'
	43	% ''.join([u'<li>%s</li>' % force_unicode(e) for e in self]))
40	44
41	45	def as_text(self):