summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorR. David Murray <rdmurray@bitdance.com>2010-12-06 18:45:46 (GMT)
committerR. David Murray <rdmurray@bitdance.com>2010-12-06 18:45:46 (GMT)
commit13219a3e9b433a563a140ea05d842667d0982b7a (patch)
tree40a514227596bc4306b06b2e0d725d9802cb0d98 /Lib
parent950b3d898cfe676d239f3b7105eb25301a803672 (diff)
downloadcpython-13219a3e9b433a563a140ea05d842667d0982b7a.zip
cpython-13219a3e9b433a563a140ea05d842667d0982b7a.tar.gz
cpython-13219a3e9b433a563a140ea05d842667d0982b7a.tar.bz2
Merged revisions 85130 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r85130 | r.david.murray | 2010-09-30 22:08:02 -0400 (Thu, 30 Sep 2010) | 2 lines Fix a couple spelling errors in comments and delete redundant __len__ def. ........
Diffstat (limited to 'Lib')
-rw-r--r--Lib/email/message.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/email/message.py b/Lib/email/message.py
index 08423cd..40f808e 100644
--- a/Lib/email/message.py
+++ b/Lib/email/message.py
@@ -97,7 +97,7 @@ class Message:
objects, otherwise it is a string.
Message objects implement part of the `mapping' interface, which assumes
- there is exactly one occurrance of the header per message. Some headers
+ there is exactly one occurrence of the header per message. Some headers
do in fact appear multiple times (e.g. Received) and for those headers,
you must use the explicit API to set or get all the headers. Not all of
the mapping methods are implemented.
@@ -286,7 +286,7 @@ class Message:
Return None if the header is missing instead of raising an exception.
Note that if the header appeared multiple times, exactly which
- occurrance gets returned is undefined. Use get_all() to get all
+ occurrence gets returned is undefined. Use get_all() to get all
the values matching a header field name.
"""
return self.get(name)