Issue #25523: Merge "a" to "an" fixes from 3.4 into 3.5

This commit is contained in:
Martin Panter 2015-11-02 04:04:57 +00:00
commit 2eb819f7a8
86 changed files with 136 additions and 136 deletions

View file

@ -3052,7 +3052,7 @@ class TestMiscellaneous(TestEmailBase):
# issue 1690608. email.utils.formataddr() should be rfc2047 aware.
name = "H\u00e4ns W\u00fcrst"
addr = 'person@dom.ain'
# A object without a header_encode method:
# An object without a header_encode method:
bad_charset = object()
self.assertRaises(AttributeError, utils.formataddr, (name, addr),
bad_charset)