Navigation

Changeset 6989

Timestamp:

01/02/08 02:39:03 (9 months ago)

Author:

adrian

Message:

Fixed #6299 -- Fixed an indentation error in django/core/mail.py introduced in [6987]

Files:

r6987	r6989
69	69
70	70	def forbid_multi_line_headers(name, val):
71		"Forbids multi-line headers, to prevent header injection."
72		if '\n' in val or '\r' in val:
73		~~raise BadHeaderError, "Header values can't contain newlines (got %r for header %r)" % (val, name~~)
74		try:
75		val = force_unicode(val).encode('ascii')
76		except UnicodeEncodeError:
77		if name.lower() in ('to', 'from', 'cc'):
78		result = []
79		for item in val.split(', '):
80		nm, addr = parseaddr(item)
81		nm = str(Header(nm, settings.DEFAULT_CHARSET))
82		result.append(formataddr((nm, str(addr))))
83		val = ', '.join(result)
84		else:
85		val = Header(force_unicode(val), settings.DEFAULT_CHARSET)
86		return ~~(name, val)~~
	71	"Forbids multi-line headers, to prevent header injection."
	72	if '\n' in val or '\r' in val:
	73	raise BadHeaderError("Header values can't contain newlines (got %r for header %r)" % (val, name))
	74	try:
	75	val = force_unicode(val).encode('ascii')
	76	except UnicodeEncodeError:
	77	if name.lower() in ('to', 'from', 'cc'):
	78	result = []
	79	for item in val.split(', '):
	80	nm, addr = parseaddr(item)
	81	nm = str(Header(nm, settings.DEFAULT_CHARSET))
	82	result.append(formataddr((nm, str(addr))))
	83	val = ', '.join(result)
	84	else:
	85	val = Header(force_unicode(val), settings.DEFAULT_CHARSET)
	86	return name, val
87	87
88	88	class SafeMIMEText(MIMEText):