diff options
| author | R. David Murray <rdmurray@bitdance.com> | 2010-12-29 19:03:53 (GMT) |
|---|---|---|
| committer | R. David Murray <rdmurray@bitdance.com> | 2010-12-29 19:03:53 (GMT) |
| commit | 5723d225f8017f302d1791ce414144e864fbdf56 (patch) | |
| tree | 81af7ee496345a6a0b052d4e490f97667808ed37 /Lib/email | |
| parent | e5f8e849c8b11acc7890425fcba051647d7bb35d (diff) | |
| download | cpython-5723d225f8017f302d1791ce414144e864fbdf56.zip cpython-5723d225f8017f302d1791ce414144e864fbdf56.tar.gz cpython-5723d225f8017f302d1791ce414144e864fbdf56.tar.bz2 | |
Merged revisions 87567 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r87567 | r.david.murray | 2010-12-29 11:57:24 -0500 (Wed, 29 Dec 2010) | 2 lines
Fix a comment typo and update another comment to match Python3 reality
........
Diffstat (limited to 'Lib/email')
| -rw-r--r-- | Lib/email/header.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/email/header.py b/Lib/email/header.py index afcea40..8194fa3 100644 --- a/Lib/email/header.py +++ b/Lib/email/header.py @@ -169,7 +169,7 @@ class Header: charset is used both as s's initial charset and as the default for subsequent .append() calls. - The maximum line length can be specified explicit via maxlinelen. For + The maximum line length can be specified explicitly via maxlinelen. For splitting the first line to a shorter value (to account for the field header which isn't included in s, e.g. `Subject') pass in the name of the field in header_name. The default maxlinelen is 78 as recommended @@ -241,7 +241,7 @@ class Header: constructor is used. s may be a byte string or a Unicode string. If it is a byte string - (i.e. isinstance(s, str) is true), then charset is the encoding of + (i.e. isinstance(s, str) is false), then charset is the encoding of that byte string, and a UnicodeError will be raised if the string cannot be decoded with that charset. If s is a Unicode string, then charset is a hint specifying the character set of the characters in |