Ticket #3690: util.py.diff

File util.py.diff, 483 bytes (added by fback+django@fback.net, 2 years ago)
proposed patch

util.py

old	new
12	12	else:
13	13	s = unicode(str(s), settings.DEFAULT_CHARSET)
14	14	elif not isinstance(s, unicode):
15		s = unicode(s, settings.DEFAULT_CHARSET)
	15	try:
	16	s = unicode(s, settings.DEFAULT_CHARSET)
	17	except UnicodeError:
	18	s = s.decode('ascii', 'replace')
16	19	return s
17	20
18	21