[Python-checkins] cpython: #12586: Fix a small oversight in the new email policy header setting code.
r.david.murray
python-checkins at python.org
Sat May 26 04:53:20 CEST 2012
http://hg.python.org/cpython/rev/2b6f183091b9
changeset: 77156:2b6f183091b9
user: R David Murray <rdmurray at bitdance.com>
date: Fri May 25 22:53:12 2012 -0400
summary:
#12586: Fix a small oversight in the new email policy header setting code.
This is a danger of focusing on unit tests: sometimes you forget
to do the integration tests.
files:
Lib/email/policy.py | 2 +-
Lib/test/test_email/test__headerregistry.py | 22 ++++++++++
2 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/Lib/email/policy.py b/Lib/email/policy.py
--- a/Lib/email/policy.py
+++ b/Lib/email/policy.py
@@ -104,7 +104,7 @@
"""
if hasattr(value, 'name') and value.name.lower() == name.lower():
return (name, value)
- if len(value.splitlines())>1:
+ if isinstance(value, str) and len(value.splitlines())>1:
raise ValueError("Header values may not contain linefeed "
"or carriage return characters")
return (name, self.header_factory(name, value))
diff --git a/Lib/test/test_email/test__headerregistry.py b/Lib/test/test_email/test__headerregistry.py
--- a/Lib/test/test_email/test__headerregistry.py
+++ b/Lib/test/test_email/test__headerregistry.py
@@ -3,6 +3,7 @@
import unittest
from email import errors
from email import policy
+from email.message import Message
from test.test_email import TestEmailBase
from email import _headerregistry
# Address and Group are public but I'm not sure where to put them yet.
@@ -168,6 +169,12 @@
with self.assertRaises(AttributeError):
h.datetime = 'foo'
+ def test_set_date_header_from_datetime(self):
+ m = Message(policy=policy.default)
+ m['Date'] = self.dt
+ self.assertEqual(m['Date'], self.datestring)
+ self.assertEqual(m['Date'].datetime, self.dt)
+
class TestAddressHeader(TestHeaderBase):
@@ -625,6 +632,20 @@
self.assertEqual(g.addresses, tuple())
self.assertEqual(str(g), 'foo bar:;')
+ def test_set_message_header_from_address(self):
+ a = Address('foo', 'bar', 'example.com')
+ m = Message(policy=policy.default)
+ m['To'] = a
+ self.assertEqual(m['to'], 'foo <bar at example.com>')
+ self.assertEqual(m['to'].addresses, (a,))
+
+ def test_set_message_header_from_group(self):
+ g = Group('foo bar')
+ m = Message(policy=policy.default)
+ m['To'] = g
+ self.assertEqual(m['to'], 'foo bar:;')
+ self.assertEqual(m['to'].addresses, g.addresses)
+
class TestFolding(TestHeaderBase):
@@ -713,5 +734,6 @@
'Date: Sat, 02 Feb 2002 17:00:06 -0800\n')
+
if __name__ == '__main__':
unittest.main()
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list