2007-08-15 11:28:22 -03:00
|
|
|
|
|
|
|
:mod:`rfc822` --- Parse RFC 2822 mail headers
|
|
|
|
=============================================
|
|
|
|
|
|
|
|
.. module:: rfc822
|
|
|
|
:synopsis: Parse 2822 style mail messages.
|
2007-08-16 21:24:54 -03:00
|
|
|
:deprecated:
|
2007-08-15 11:28:22 -03:00
|
|
|
|
|
|
|
|
|
|
|
.. deprecated:: 2.3
|
|
|
|
The :mod:`email` package should be used in preference to the :mod:`rfc822`
|
|
|
|
module. This module is present only to maintain backward compatibility.
|
|
|
|
|
|
|
|
This module defines a class, :class:`Message`, which represents an "email
|
|
|
|
message" as defined by the Internet standard :rfc:`2822`. [#]_ Such messages
|
|
|
|
consist of a collection of message headers, and a message body. This module
|
|
|
|
also defines a helper class :class:`AddressList` for parsing :rfc:`2822`
|
|
|
|
addresses. Please refer to the RFC for information on the specific syntax of
|
|
|
|
:rfc:`2822` messages.
|
|
|
|
|
|
|
|
.. index:: module: mailbox
|
|
|
|
|
|
|
|
The :mod:`mailbox` module provides classes to read mailboxes produced by
|
|
|
|
various end-user mail programs.
|
|
|
|
|
|
|
|
|
|
|
|
.. class:: Message(file[, seekable])
|
|
|
|
|
|
|
|
A :class:`Message` instance is instantiated with an input object as parameter.
|
|
|
|
Message relies only on the input object having a :meth:`readline` method; in
|
|
|
|
particular, ordinary file objects qualify. Instantiation reads headers from the
|
|
|
|
input object up to a delimiter line (normally a blank line) and stores them in
|
|
|
|
the instance. The message body, following the headers, is not consumed.
|
|
|
|
|
|
|
|
This class can work with any input object that supports a :meth:`readline`
|
|
|
|
method. If the input object has seek and tell capability, the
|
|
|
|
:meth:`rewindbody` method will work; also, illegal lines will be pushed back
|
|
|
|
onto the input stream. If the input object lacks seek but has an :meth:`unread`
|
|
|
|
method that can push back a line of input, :class:`Message` will use that to
|
|
|
|
push back illegal lines. Thus this class can be used to parse messages coming
|
|
|
|
from a buffered stream.
|
|
|
|
|
|
|
|
The optional *seekable* argument is provided as a workaround for certain stdio
|
|
|
|
libraries in which :cfunc:`tell` discards buffered data before discovering that
|
|
|
|
the :cfunc:`lseek` system call doesn't work. For maximum portability, you
|
|
|
|
should set the seekable argument to zero to prevent that initial :meth:`tell`
|
|
|
|
when passing in an unseekable object such as a file object created from a socket
|
|
|
|
object.
|
|
|
|
|
|
|
|
Input lines as read from the file may either be terminated by CR-LF or by a
|
|
|
|
single linefeed; a terminating CR-LF is replaced by a single linefeed before the
|
|
|
|
line is stored.
|
|
|
|
|
|
|
|
All header matching is done independent of upper or lower case; e.g.
|
|
|
|
``m['From']``, ``m['from']`` and ``m['FROM']`` all yield the same result.
|
|
|
|
|
|
|
|
|
|
|
|
.. class:: AddressList(field)
|
|
|
|
|
|
|
|
You may instantiate the :class:`AddressList` helper class using a single string
|
|
|
|
parameter, a comma-separated list of :rfc:`2822` addresses to be parsed. (The
|
|
|
|
parameter ``None`` yields an empty list.)
|
|
|
|
|
|
|
|
|
|
|
|
.. function:: quote(str)
|
|
|
|
|
|
|
|
Return a new string with backslashes in *str* replaced by two backslashes and
|
|
|
|
double quotes replaced by backslash-double quote.
|
|
|
|
|
|
|
|
|
|
|
|
.. function:: unquote(str)
|
|
|
|
|
|
|
|
Return a new string which is an *unquoted* version of *str*. If *str* ends and
|
|
|
|
begins with double quotes, they are stripped off. Likewise if *str* ends and
|
|
|
|
begins with angle brackets, they are stripped off.
|
|
|
|
|
|
|
|
|
|
|
|
.. function:: parseaddr(address)
|
|
|
|
|
|
|
|
Parse *address*, which should be the value of some address-containing field such
|
|
|
|
as :mailheader:`To` or :mailheader:`Cc`, into its constituent "realname" and
|
|
|
|
"email address" parts. Returns a tuple of that information, unless the parse
|
|
|
|
fails, in which case a 2-tuple ``(None, None)`` is returned.
|
|
|
|
|
|
|
|
|
|
|
|
.. function:: dump_address_pair(pair)
|
|
|
|
|
|
|
|
The inverse of :meth:`parseaddr`, this takes a 2-tuple of the form ``(realname,
|
|
|
|
email_address)`` and returns the string value suitable for a :mailheader:`To` or
|
|
|
|
:mailheader:`Cc` header. If the first element of *pair* is false, then the
|
|
|
|
second element is returned unmodified.
|
|
|
|
|
|
|
|
|
|
|
|
.. function:: parsedate(date)
|
|
|
|
|
|
|
|
Attempts to parse a date according to the rules in :rfc:`2822`. however, some
|
|
|
|
mailers don't follow that format as specified, so :func:`parsedate` tries to
|
|
|
|
guess correctly in such cases. *date* is a string containing an :rfc:`2822`
|
|
|
|
date, such as ``'Mon, 20 Nov 1995 19:12:08 -0500'``. If it succeeds in parsing
|
|
|
|
the date, :func:`parsedate` returns a 9-tuple that can be passed directly to
|
|
|
|
:func:`time.mktime`; otherwise ``None`` will be returned. Note that indexes 6,
|
|
|
|
7, and 8 of the result tuple are not usable.
|
|
|
|
|
|
|
|
|
|
|
|
.. function:: parsedate_tz(date)
|
|
|
|
|
|
|
|
Performs the same function as :func:`parsedate`, but returns either ``None`` or
|
|
|
|
a 10-tuple; the first 9 elements make up a tuple that can be passed directly to
|
|
|
|
:func:`time.mktime`, and the tenth is the offset of the date's timezone from UTC
|
|
|
|
(which is the official term for Greenwich Mean Time). (Note that the sign of
|
|
|
|
the timezone offset is the opposite of the sign of the ``time.timezone``
|
|
|
|
variable for the same timezone; the latter variable follows the POSIX standard
|
|
|
|
while this module follows :rfc:`2822`.) If the input string has no timezone,
|
|
|
|
the last element of the tuple returned is ``None``. Note that indexes 6, 7, and
|
|
|
|
8 of the result tuple are not usable.
|
|
|
|
|
|
|
|
|
|
|
|
.. function:: mktime_tz(tuple)
|
|
|
|
|
|
|
|
Turn a 10-tuple as returned by :func:`parsedate_tz` into a UTC timestamp. If
|
|
|
|
the timezone item in the tuple is ``None``, assume local time. Minor
|
|
|
|
deficiency: this first interprets the first 8 elements as a local time and then
|
|
|
|
compensates for the timezone difference; this may yield a slight error around
|
|
|
|
daylight savings time switch dates. Not enough to worry about for common use.
|
|
|
|
|
|
|
|
|
|
|
|
.. seealso::
|
|
|
|
|
|
|
|
Module :mod:`email`
|
|
|
|
Comprehensive email handling package; supersedes the :mod:`rfc822` module.
|
|
|
|
|
|
|
|
Module :mod:`mailbox`
|
|
|
|
Classes to read various mailbox formats produced by end-user mail programs.
|
|
|
|
|
|
|
|
Module :mod:`mimetools`
|
|
|
|
Subclass of :class:`rfc822.Message` that handles MIME encoded messages.
|
|
|
|
|
|
|
|
|
|
|
|
.. _message-objects:
|
|
|
|
|
|
|
|
Message Objects
|
|
|
|
---------------
|
|
|
|
|
|
|
|
A :class:`Message` instance has the following methods:
|
|
|
|
|
|
|
|
|
|
|
|
.. method:: Message.rewindbody()
|
|
|
|
|
|
|
|
Seek to the start of the message body. This only works if the file object is
|
|
|
|
seekable.
|
|
|
|
|
|
|
|
|
|
|
|
.. method:: Message.isheader(line)
|
|
|
|
|
|
|
|
Returns a line's canonicalized fieldname (the dictionary key that will be used
|
|
|
|
to index it) if the line is a legal :rfc:`2822` header; otherwise returns
|
|
|
|
``None`` (implying that parsing should stop here and the line be pushed back on
|
|
|
|
the input stream). It is sometimes useful to override this method in a
|
|
|
|
subclass.
|
|
|
|
|
|
|
|
|
|
|
|
.. method:: Message.islast(line)
|
|
|
|
|
|
|
|
Return true if the given line is a delimiter on which Message should stop. The
|
|
|
|
delimiter line is consumed, and the file object's read location positioned
|
|
|
|
immediately after it. By default this method just checks that the line is
|
|
|
|
blank, but you can override it in a subclass.
|
|
|
|
|
|
|
|
|
|
|
|
.. method:: Message.iscomment(line)
|
|
|
|
|
|
|
|
Return ``True`` if the given line should be ignored entirely, just skipped. By
|
|
|
|
default this is a stub that always returns ``False``, but you can override it in
|
|
|
|
a subclass.
|
|
|
|
|
|
|
|
|
|
|
|
.. method:: Message.getallmatchingheaders(name)
|
|
|
|
|
|
|
|
Return a list of lines consisting of all headers matching *name*, if any. Each
|
|
|
|
physical line, whether it is a continuation line or not, is a separate list
|
|
|
|
item. Return the empty list if no header matches *name*.
|
|
|
|
|
|
|
|
|
|
|
|
.. method:: Message.getfirstmatchingheader(name)
|
|
|
|
|
|
|
|
Return a list of lines comprising the first header matching *name*, and its
|
|
|
|
continuation line(s), if any. Return ``None`` if there is no header matching
|
|
|
|
*name*.
|
|
|
|
|
|
|
|
|
|
|
|
.. method:: Message.getrawheader(name)
|
|
|
|
|
|
|
|
Return a single string consisting of the text after the colon in the first
|
|
|
|
header matching *name*. This includes leading whitespace, the trailing
|
|
|
|
linefeed, and internal linefeeds and whitespace if there any continuation
|
|
|
|
line(s) were present. Return ``None`` if there is no header matching *name*.
|
|
|
|
|
|
|
|
|
|
|
|
.. method:: Message.getheader(name[, default])
|
|
|
|
|
Merge the trunk changes in. Breaks socket.ssl for now.
Merged revisions 57392-57619 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r57395 | georg.brandl | 2007-08-24 19:23:23 +0200 (Fri, 24 Aug 2007) | 2 lines
Bug #1011: fix rfc822.Message.getheader docs.
........
r57397 | georg.brandl | 2007-08-24 19:38:49 +0200 (Fri, 24 Aug 2007) | 2 lines
Patch #1006: port test_winreg to unittest.
........
r57398 | georg.brandl | 2007-08-24 19:46:54 +0200 (Fri, 24 Aug 2007) | 2 lines
Fix #1012: wrong URL to :mod:`site` in install/index.rst.
........
r57399 | georg.brandl | 2007-08-24 20:07:52 +0200 (Fri, 24 Aug 2007) | 2 lines
Patch #1008: port test_signal to unittest.
........
r57400 | georg.brandl | 2007-08-24 20:22:54 +0200 (Fri, 24 Aug 2007) | 2 lines
Port test_frozen to unittest.
........
r57401 | georg.brandl | 2007-08-24 20:27:43 +0200 (Fri, 24 Aug 2007) | 2 lines
Document new utility functions in test_support.
........
r57402 | georg.brandl | 2007-08-24 20:30:06 +0200 (Fri, 24 Aug 2007) | 2 lines
Remove test_rgbimg output file, there is no test_rgbimg.py.
........
r57403 | georg.brandl | 2007-08-24 20:35:27 +0200 (Fri, 24 Aug 2007) | 2 lines
Remove output file for test_ossaudiodev, also properly close the dsp object.
........
r57404 | georg.brandl | 2007-08-24 20:46:27 +0200 (Fri, 24 Aug 2007) | 2 lines
Convert test_linuxaudiodev to unittest. Fix a wrong finally clause in test_ossaudiodev.
........
r57406 | collin.winter | 2007-08-24 21:13:58 +0200 (Fri, 24 Aug 2007) | 1 line
Convert test_pkg to use unittest.
........
r57408 | georg.brandl | 2007-08-24 21:22:34 +0200 (Fri, 24 Aug 2007) | 2 lines
Catch the correct errors.
........
r57409 | georg.brandl | 2007-08-24 21:33:53 +0200 (Fri, 24 Aug 2007) | 2 lines
Port test_class to unittest. Patch #1671298.
........
r57415 | collin.winter | 2007-08-24 23:09:42 +0200 (Fri, 24 Aug 2007) | 1 line
Make test_structmembers pass when run with regrtests's -R flag.
........
r57455 | nick.coghlan | 2007-08-25 06:32:07 +0200 (Sat, 25 Aug 2007) | 1 line
Revert misguided attempt at fixing incompatibility between -m and -i switches (better fix coming soon)
........
r57456 | nick.coghlan | 2007-08-25 06:35:54 +0200 (Sat, 25 Aug 2007) | 1 line
Revert compile.c changes that shouldn't have been included in previous checkin
........
r57461 | nick.coghlan | 2007-08-25 12:50:41 +0200 (Sat, 25 Aug 2007) | 1 line
Fix bug 1764407 - the -i switch now does the right thing when using the -m switch
........
r57464 | guido.van.rossum | 2007-08-25 17:08:43 +0200 (Sat, 25 Aug 2007) | 4 lines
Server-side SSL and certificate validation, by Bill Janssen.
While cleaning up Bill's C style, I may have cleaned up some code
he didn't touch as well (in _ssl.c).
........
r57465 | neal.norwitz | 2007-08-25 18:41:36 +0200 (Sat, 25 Aug 2007) | 3 lines
Try to get this to build with Visual Studio by moving all the variable
declarations to the beginning of a scope.
........
r57466 | neal.norwitz | 2007-08-25 18:54:38 +0200 (Sat, 25 Aug 2007) | 1 line
Fix test so it is skipped properly if there is no SSL support.
........
r57467 | neal.norwitz | 2007-08-25 18:58:09 +0200 (Sat, 25 Aug 2007) | 2 lines
Fix a few more variables to try to get this to compile with Visual Studio.
........
r57473 | neal.norwitz | 2007-08-25 19:25:17 +0200 (Sat, 25 Aug 2007) | 1 line
Try to get this test to pass for systems that do not have SO_REUSEPORT
........
r57482 | gregory.p.smith | 2007-08-26 02:26:00 +0200 (Sun, 26 Aug 2007) | 7 lines
keep setup.py from listing unneeded hash modules (_md5, _sha*) as
missing when they were not built because _hashlib with openssl provided
their functionality instead.
don't build bsddb185 if bsddb was built.
........
r57483 | neal.norwitz | 2007-08-26 03:08:16 +0200 (Sun, 26 Aug 2007) | 1 line
Fix typo in docstring (missing c in reacquire)
........
r57484 | neal.norwitz | 2007-08-26 03:42:03 +0200 (Sun, 26 Aug 2007) | 2 lines
Spell check (also americanify behaviour, it's almost 3 times as common)
........
r57503 | neal.norwitz | 2007-08-26 08:29:57 +0200 (Sun, 26 Aug 2007) | 4 lines
Reap children before the test starts so hopefully SocketServer
won't find any old children left around which causes an exception
in collect_children() and the test to fail.
........
r57510 | neal.norwitz | 2007-08-26 20:50:39 +0200 (Sun, 26 Aug 2007) | 1 line
Fail gracefully if the cert files cannot be created
........
r57513 | guido.van.rossum | 2007-08-26 21:35:09 +0200 (Sun, 26 Aug 2007) | 4 lines
Bill Janssen wrote:
Here's a patch which makes test_ssl a better player in the buildbots
environment. I deep-ended on "try-except-else" clauses.
........
r57518 | neal.norwitz | 2007-08-26 23:40:16 +0200 (Sun, 26 Aug 2007) | 1 line
Get the test passing by commenting out some writes (should they be removed?)
........
r57522 | neal.norwitz | 2007-08-27 00:16:23 +0200 (Mon, 27 Aug 2007) | 3 lines
Catch IOError for when the device file doesn't exist or the user doesn't have
permission to write to the device.
........
r57524 | neal.norwitz | 2007-08-27 00:20:03 +0200 (Mon, 27 Aug 2007) | 5 lines
Another patch from Bill Janssen that:
1) Fixes the bug that two class names are initial-lower-case.
2) Replaces the poll waiting for the server to become ready with
a threading.Event signal.
........
r57536 | neal.norwitz | 2007-08-27 02:58:33 +0200 (Mon, 27 Aug 2007) | 1 line
Stop using string.join (from the module) to ease upgrade to py3k
........
r57537 | neal.norwitz | 2007-08-27 03:03:18 +0200 (Mon, 27 Aug 2007) | 1 line
Make a utility function for handling (printing) an error
........
r57538 | neal.norwitz | 2007-08-27 03:15:33 +0200 (Mon, 27 Aug 2007) | 4 lines
If we can't create a certificate, print a warning, but don't fail the test.
Modified patch from what Bill Janssen sent on python-3000.
........
r57539 | facundo.batista | 2007-08-27 03:15:34 +0200 (Mon, 27 Aug 2007) | 7 lines
Ignore test failures caused by 'resource temporarily unavailable'
exceptions raised in the test server thread, since SimpleXMLRPCServer
does not gracefully handle them. Changed number of requests handled
by tests server thread to one (was 2) because no tests require more
than one request. [GSoC - Alan McIntyre]
........
r57561 | guido.van.rossum | 2007-08-27 19:19:42 +0200 (Mon, 27 Aug 2007) | 8 lines
> Regardless, building a fixed test certificate and checking it in sounds like
> the better option. Then the openssl command in the test code can be turned
> into a comment describing how the test data was pregenerated.
Here's a patch that does that.
Bill
........
r57568 | guido.van.rossum | 2007-08-27 20:42:23 +0200 (Mon, 27 Aug 2007) | 26 lines
> Some of the code sets the error string in this directly before
> returning NULL, and other pieces of the code call PySSL_SetError,
> which creates the error string. I think some of the places which set
> the string directly probably shouldn't; instead, they should call
> PySSL_SetError to cons up the error name directly from the err code.
> However, PySSL_SetError only works after the construction of an ssl
> object, which means it can't be used there... I'll take a longer look
> at it and see if there's a reasonable fix.
Here's a patch which addresses this. It also fixes the indentation in
PySSL_SetError, bringing it into line with PEP 7, fixes a compile warning
about one of the OpenSSL macros, and makes the namespace a bit more
consistent. I've tested it on FC 7 and OS X 10.4.
% ./python ./Lib/test/regrtest.py -R :1: -u all test_ssl
test_ssl
beginning 6 repetitions
123456
......
1 test OK.
[29244 refs]
%
[GvR: slightly edited to enforce 79-char line length, even if it required
violating the style guide.]
........
r57570 | guido.van.rossum | 2007-08-27 21:11:11 +0200 (Mon, 27 Aug 2007) | 2 lines
Patch 10124 by Bill Janssen, docs for the new ssl code.
........
r57574 | guido.van.rossum | 2007-08-27 22:51:00 +0200 (Mon, 27 Aug 2007) | 3 lines
Patch # 1739906 by Christian Heimes -- add reduce to functools (importing
it from __builtin__).
........
r57575 | guido.van.rossum | 2007-08-27 22:52:10 +0200 (Mon, 27 Aug 2007) | 2 lines
News about functools.reduce.
........
r57611 | georg.brandl | 2007-08-28 10:29:08 +0200 (Tue, 28 Aug 2007) | 2 lines
Document rev. 57574.
........
r57612 | sean.reifschneider | 2007-08-28 11:07:54 +0200 (Tue, 28 Aug 2007) | 2 lines
Adding basic imputil documentation.
........
r57614 | georg.brandl | 2007-08-28 12:48:18 +0200 (Tue, 28 Aug 2007) | 2 lines
Fix some glitches.
........
r57616 | lars.gustaebel | 2007-08-28 14:31:09 +0200 (Tue, 28 Aug 2007) | 5 lines
TarFile.__init__() no longer fails if no name argument is passed and
the fileobj argument has no usable name attribute (e.g. StringIO).
(will backport to 2.5)
........
r57619 | thomas.wouters | 2007-08-28 17:28:19 +0200 (Tue, 28 Aug 2007) | 22 lines
Improve extended slicing support in builtin types and classes. Specifically:
- Specialcase extended slices that amount to a shallow copy the same way as
is done for simple slices, in the tuple, string and unicode case.
- Specialcase step-1 extended slices to optimize the common case for all
involved types.
- For lists, allow extended slice assignment of differing lengths as long
as the step is 1. (Previously, 'l[:2:1] = []' failed even though
'l[:2] = []' and 'l[:2:None] = []' do not.)
- Implement extended slicing for buffer, array, structseq, mmap and
UserString.UserString.
- Implement slice-object support (but not non-step-1 slice assignment) for
UserString.MutableString.
- Add tests for all new functionality.
........
2007-08-28 18:37:11 -03:00
|
|
|
Return a single string consisting of the last header matching *name*,
|
|
|
|
but strip leading and trailing whitespace.
|
2007-08-15 11:28:22 -03:00
|
|
|
Internal whitespace is not stripped. The optional *default* argument can be
|
|
|
|
used to specify a different default to be returned when there is no header
|
Merge the trunk changes in. Breaks socket.ssl for now.
Merged revisions 57392-57619 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r57395 | georg.brandl | 2007-08-24 19:23:23 +0200 (Fri, 24 Aug 2007) | 2 lines
Bug #1011: fix rfc822.Message.getheader docs.
........
r57397 | georg.brandl | 2007-08-24 19:38:49 +0200 (Fri, 24 Aug 2007) | 2 lines
Patch #1006: port test_winreg to unittest.
........
r57398 | georg.brandl | 2007-08-24 19:46:54 +0200 (Fri, 24 Aug 2007) | 2 lines
Fix #1012: wrong URL to :mod:`site` in install/index.rst.
........
r57399 | georg.brandl | 2007-08-24 20:07:52 +0200 (Fri, 24 Aug 2007) | 2 lines
Patch #1008: port test_signal to unittest.
........
r57400 | georg.brandl | 2007-08-24 20:22:54 +0200 (Fri, 24 Aug 2007) | 2 lines
Port test_frozen to unittest.
........
r57401 | georg.brandl | 2007-08-24 20:27:43 +0200 (Fri, 24 Aug 2007) | 2 lines
Document new utility functions in test_support.
........
r57402 | georg.brandl | 2007-08-24 20:30:06 +0200 (Fri, 24 Aug 2007) | 2 lines
Remove test_rgbimg output file, there is no test_rgbimg.py.
........
r57403 | georg.brandl | 2007-08-24 20:35:27 +0200 (Fri, 24 Aug 2007) | 2 lines
Remove output file for test_ossaudiodev, also properly close the dsp object.
........
r57404 | georg.brandl | 2007-08-24 20:46:27 +0200 (Fri, 24 Aug 2007) | 2 lines
Convert test_linuxaudiodev to unittest. Fix a wrong finally clause in test_ossaudiodev.
........
r57406 | collin.winter | 2007-08-24 21:13:58 +0200 (Fri, 24 Aug 2007) | 1 line
Convert test_pkg to use unittest.
........
r57408 | georg.brandl | 2007-08-24 21:22:34 +0200 (Fri, 24 Aug 2007) | 2 lines
Catch the correct errors.
........
r57409 | georg.brandl | 2007-08-24 21:33:53 +0200 (Fri, 24 Aug 2007) | 2 lines
Port test_class to unittest. Patch #1671298.
........
r57415 | collin.winter | 2007-08-24 23:09:42 +0200 (Fri, 24 Aug 2007) | 1 line
Make test_structmembers pass when run with regrtests's -R flag.
........
r57455 | nick.coghlan | 2007-08-25 06:32:07 +0200 (Sat, 25 Aug 2007) | 1 line
Revert misguided attempt at fixing incompatibility between -m and -i switches (better fix coming soon)
........
r57456 | nick.coghlan | 2007-08-25 06:35:54 +0200 (Sat, 25 Aug 2007) | 1 line
Revert compile.c changes that shouldn't have been included in previous checkin
........
r57461 | nick.coghlan | 2007-08-25 12:50:41 +0200 (Sat, 25 Aug 2007) | 1 line
Fix bug 1764407 - the -i switch now does the right thing when using the -m switch
........
r57464 | guido.van.rossum | 2007-08-25 17:08:43 +0200 (Sat, 25 Aug 2007) | 4 lines
Server-side SSL and certificate validation, by Bill Janssen.
While cleaning up Bill's C style, I may have cleaned up some code
he didn't touch as well (in _ssl.c).
........
r57465 | neal.norwitz | 2007-08-25 18:41:36 +0200 (Sat, 25 Aug 2007) | 3 lines
Try to get this to build with Visual Studio by moving all the variable
declarations to the beginning of a scope.
........
r57466 | neal.norwitz | 2007-08-25 18:54:38 +0200 (Sat, 25 Aug 2007) | 1 line
Fix test so it is skipped properly if there is no SSL support.
........
r57467 | neal.norwitz | 2007-08-25 18:58:09 +0200 (Sat, 25 Aug 2007) | 2 lines
Fix a few more variables to try to get this to compile with Visual Studio.
........
r57473 | neal.norwitz | 2007-08-25 19:25:17 +0200 (Sat, 25 Aug 2007) | 1 line
Try to get this test to pass for systems that do not have SO_REUSEPORT
........
r57482 | gregory.p.smith | 2007-08-26 02:26:00 +0200 (Sun, 26 Aug 2007) | 7 lines
keep setup.py from listing unneeded hash modules (_md5, _sha*) as
missing when they were not built because _hashlib with openssl provided
their functionality instead.
don't build bsddb185 if bsddb was built.
........
r57483 | neal.norwitz | 2007-08-26 03:08:16 +0200 (Sun, 26 Aug 2007) | 1 line
Fix typo in docstring (missing c in reacquire)
........
r57484 | neal.norwitz | 2007-08-26 03:42:03 +0200 (Sun, 26 Aug 2007) | 2 lines
Spell check (also americanify behaviour, it's almost 3 times as common)
........
r57503 | neal.norwitz | 2007-08-26 08:29:57 +0200 (Sun, 26 Aug 2007) | 4 lines
Reap children before the test starts so hopefully SocketServer
won't find any old children left around which causes an exception
in collect_children() and the test to fail.
........
r57510 | neal.norwitz | 2007-08-26 20:50:39 +0200 (Sun, 26 Aug 2007) | 1 line
Fail gracefully if the cert files cannot be created
........
r57513 | guido.van.rossum | 2007-08-26 21:35:09 +0200 (Sun, 26 Aug 2007) | 4 lines
Bill Janssen wrote:
Here's a patch which makes test_ssl a better player in the buildbots
environment. I deep-ended on "try-except-else" clauses.
........
r57518 | neal.norwitz | 2007-08-26 23:40:16 +0200 (Sun, 26 Aug 2007) | 1 line
Get the test passing by commenting out some writes (should they be removed?)
........
r57522 | neal.norwitz | 2007-08-27 00:16:23 +0200 (Mon, 27 Aug 2007) | 3 lines
Catch IOError for when the device file doesn't exist or the user doesn't have
permission to write to the device.
........
r57524 | neal.norwitz | 2007-08-27 00:20:03 +0200 (Mon, 27 Aug 2007) | 5 lines
Another patch from Bill Janssen that:
1) Fixes the bug that two class names are initial-lower-case.
2) Replaces the poll waiting for the server to become ready with
a threading.Event signal.
........
r57536 | neal.norwitz | 2007-08-27 02:58:33 +0200 (Mon, 27 Aug 2007) | 1 line
Stop using string.join (from the module) to ease upgrade to py3k
........
r57537 | neal.norwitz | 2007-08-27 03:03:18 +0200 (Mon, 27 Aug 2007) | 1 line
Make a utility function for handling (printing) an error
........
r57538 | neal.norwitz | 2007-08-27 03:15:33 +0200 (Mon, 27 Aug 2007) | 4 lines
If we can't create a certificate, print a warning, but don't fail the test.
Modified patch from what Bill Janssen sent on python-3000.
........
r57539 | facundo.batista | 2007-08-27 03:15:34 +0200 (Mon, 27 Aug 2007) | 7 lines
Ignore test failures caused by 'resource temporarily unavailable'
exceptions raised in the test server thread, since SimpleXMLRPCServer
does not gracefully handle them. Changed number of requests handled
by tests server thread to one (was 2) because no tests require more
than one request. [GSoC - Alan McIntyre]
........
r57561 | guido.van.rossum | 2007-08-27 19:19:42 +0200 (Mon, 27 Aug 2007) | 8 lines
> Regardless, building a fixed test certificate and checking it in sounds like
> the better option. Then the openssl command in the test code can be turned
> into a comment describing how the test data was pregenerated.
Here's a patch that does that.
Bill
........
r57568 | guido.van.rossum | 2007-08-27 20:42:23 +0200 (Mon, 27 Aug 2007) | 26 lines
> Some of the code sets the error string in this directly before
> returning NULL, and other pieces of the code call PySSL_SetError,
> which creates the error string. I think some of the places which set
> the string directly probably shouldn't; instead, they should call
> PySSL_SetError to cons up the error name directly from the err code.
> However, PySSL_SetError only works after the construction of an ssl
> object, which means it can't be used there... I'll take a longer look
> at it and see if there's a reasonable fix.
Here's a patch which addresses this. It also fixes the indentation in
PySSL_SetError, bringing it into line with PEP 7, fixes a compile warning
about one of the OpenSSL macros, and makes the namespace a bit more
consistent. I've tested it on FC 7 and OS X 10.4.
% ./python ./Lib/test/regrtest.py -R :1: -u all test_ssl
test_ssl
beginning 6 repetitions
123456
......
1 test OK.
[29244 refs]
%
[GvR: slightly edited to enforce 79-char line length, even if it required
violating the style guide.]
........
r57570 | guido.van.rossum | 2007-08-27 21:11:11 +0200 (Mon, 27 Aug 2007) | 2 lines
Patch 10124 by Bill Janssen, docs for the new ssl code.
........
r57574 | guido.van.rossum | 2007-08-27 22:51:00 +0200 (Mon, 27 Aug 2007) | 3 lines
Patch # 1739906 by Christian Heimes -- add reduce to functools (importing
it from __builtin__).
........
r57575 | guido.van.rossum | 2007-08-27 22:52:10 +0200 (Mon, 27 Aug 2007) | 2 lines
News about functools.reduce.
........
r57611 | georg.brandl | 2007-08-28 10:29:08 +0200 (Tue, 28 Aug 2007) | 2 lines
Document rev. 57574.
........
r57612 | sean.reifschneider | 2007-08-28 11:07:54 +0200 (Tue, 28 Aug 2007) | 2 lines
Adding basic imputil documentation.
........
r57614 | georg.brandl | 2007-08-28 12:48:18 +0200 (Tue, 28 Aug 2007) | 2 lines
Fix some glitches.
........
r57616 | lars.gustaebel | 2007-08-28 14:31:09 +0200 (Tue, 28 Aug 2007) | 5 lines
TarFile.__init__() no longer fails if no name argument is passed and
the fileobj argument has no usable name attribute (e.g. StringIO).
(will backport to 2.5)
........
r57619 | thomas.wouters | 2007-08-28 17:28:19 +0200 (Tue, 28 Aug 2007) | 22 lines
Improve extended slicing support in builtin types and classes. Specifically:
- Specialcase extended slices that amount to a shallow copy the same way as
is done for simple slices, in the tuple, string and unicode case.
- Specialcase step-1 extended slices to optimize the common case for all
involved types.
- For lists, allow extended slice assignment of differing lengths as long
as the step is 1. (Previously, 'l[:2:1] = []' failed even though
'l[:2] = []' and 'l[:2:None] = []' do not.)
- Implement extended slicing for buffer, array, structseq, mmap and
UserString.UserString.
- Implement slice-object support (but not non-step-1 slice assignment) for
UserString.MutableString.
- Add tests for all new functionality.
........
2007-08-28 18:37:11 -03:00
|
|
|
matching *name*; it defaults to ``None``.
|
|
|
|
This is the preferred way to get parsed headers.
|
2007-08-15 11:28:22 -03:00
|
|
|
|
|
|
|
|
|
|
|
.. method:: Message.get(name[, default])
|
|
|
|
|
|
|
|
An alias for :meth:`getheader`, to make the interface more compatible with
|
|
|
|
regular dictionaries.
|
|
|
|
|
|
|
|
|
|
|
|
.. method:: Message.getaddr(name)
|
|
|
|
|
|
|
|
Return a pair ``(full name, email address)`` parsed from the string returned by
|
|
|
|
``getheader(name)``. If no header matching *name* exists, return ``(None,
|
|
|
|
None)``; otherwise both the full name and the address are (possibly empty)
|
|
|
|
strings.
|
|
|
|
|
|
|
|
Example: If *m*'s first :mailheader:`From` header contains the string
|
|
|
|
``'jack@cwi.nl (Jack Jansen)'``, then ``m.getaddr('From')`` will yield the pair
|
|
|
|
``('Jack Jansen', 'jack@cwi.nl')``. If the header contained ``'Jack Jansen
|
|
|
|
<jack@cwi.nl>'`` instead, it would yield the exact same result.
|
|
|
|
|
|
|
|
|
|
|
|
.. method:: Message.getaddrlist(name)
|
|
|
|
|
|
|
|
This is similar to ``getaddr(list)``, but parses a header containing a list of
|
|
|
|
email addresses (e.g. a :mailheader:`To` header) and returns a list of ``(full
|
|
|
|
name, email address)`` pairs (even if there was only one address in the header).
|
|
|
|
If there is no header matching *name*, return an empty list.
|
|
|
|
|
|
|
|
If multiple headers exist that match the named header (e.g. if there are several
|
|
|
|
:mailheader:`Cc` headers), all are parsed for addresses. Any continuation lines
|
|
|
|
the named headers contain are also parsed.
|
|
|
|
|
|
|
|
|
|
|
|
.. method:: Message.getdate(name)
|
|
|
|
|
|
|
|
Retrieve a header using :meth:`getheader` and parse it into a 9-tuple compatible
|
|
|
|
with :func:`time.mktime`; note that fields 6, 7, and 8 are not usable. If
|
|
|
|
there is no header matching *name*, or it is unparsable, return ``None``.
|
|
|
|
|
|
|
|
Date parsing appears to be a black art, and not all mailers adhere to the
|
|
|
|
standard. While it has been tested and found correct on a large collection of
|
|
|
|
email from many sources, it is still possible that this function may
|
|
|
|
occasionally yield an incorrect result.
|
|
|
|
|
|
|
|
|
|
|
|
.. method:: Message.getdate_tz(name)
|
|
|
|
|
|
|
|
Retrieve a header using :meth:`getheader` and parse it into a 10-tuple; the
|
|
|
|
first 9 elements will make a tuple compatible with :func:`time.mktime`, and the
|
|
|
|
10th is a number giving the offset of the date's timezone from UTC. Note that
|
|
|
|
fields 6, 7, and 8 are not usable. Similarly to :meth:`getdate`, if there is
|
|
|
|
no header matching *name*, or it is unparsable, return ``None``.
|
|
|
|
|
|
|
|
:class:`Message` instances also support a limited mapping interface. In
|
|
|
|
particular: ``m[name]`` is like ``m.getheader(name)`` but raises :exc:`KeyError`
|
|
|
|
if there is no matching header; and ``len(m)``, ``m.get(name[, default])``,
|
2007-09-01 20:34:30 -03:00
|
|
|
``m.__contains__(name)``, ``m.keys()``, ``m.values()`` ``m.items()``, and
|
2007-08-15 11:28:22 -03:00
|
|
|
``m.setdefault(name[, default])`` act as expected, with the one difference
|
|
|
|
that :meth:`setdefault` uses an empty string as the default value.
|
|
|
|
:class:`Message` instances also support the mapping writable interface ``m[name]
|
|
|
|
= value`` and ``del m[name]``. :class:`Message` objects do not support the
|
|
|
|
:meth:`clear`, :meth:`copy`, :meth:`popitem`, or :meth:`update` methods of the
|
|
|
|
mapping interface. (Support for :meth:`get` and :meth:`setdefault` was only
|
|
|
|
added in Python 2.2.)
|
|
|
|
|
|
|
|
Finally, :class:`Message` instances have some public instance variables:
|
|
|
|
|
|
|
|
|
|
|
|
.. attribute:: Message.headers
|
|
|
|
|
|
|
|
A list containing the entire set of header lines, in the order in which they
|
|
|
|
were read (except that setitem calls may disturb this order). Each line contains
|
|
|
|
a trailing newline. The blank line terminating the headers is not contained in
|
|
|
|
the list.
|
|
|
|
|
|
|
|
|
|
|
|
.. attribute:: Message.fp
|
|
|
|
|
|
|
|
The file or file-like object passed at instantiation time. This can be used to
|
|
|
|
read the message content.
|
|
|
|
|
|
|
|
|
|
|
|
.. attribute:: Message.unixfrom
|
|
|
|
|
|
|
|
The Unix ``From`` line, if the message had one, or an empty string. This is
|
|
|
|
needed to regenerate the message in some contexts, such as an ``mbox``\ -style
|
|
|
|
mailbox file.
|
|
|
|
|
|
|
|
|
|
|
|
.. _addresslist-objects:
|
|
|
|
|
|
|
|
AddressList Objects
|
|
|
|
-------------------
|
|
|
|
|
|
|
|
An :class:`AddressList` instance has the following methods:
|
|
|
|
|
|
|
|
|
|
|
|
.. method:: AddressList.__len__()
|
|
|
|
|
|
|
|
Return the number of addresses in the address list.
|
|
|
|
|
|
|
|
|
|
|
|
.. method:: AddressList.__str__()
|
|
|
|
|
|
|
|
Return a canonicalized string representation of the address list. Addresses are
|
|
|
|
rendered in "name" <host@domain> form, comma-separated.
|
|
|
|
|
|
|
|
|
|
|
|
.. method:: AddressList.__add__(alist)
|
|
|
|
|
|
|
|
Return a new :class:`AddressList` instance that contains all addresses in both
|
|
|
|
:class:`AddressList` operands, with duplicates removed (set union).
|
|
|
|
|
|
|
|
|
|
|
|
.. method:: AddressList.__iadd__(alist)
|
|
|
|
|
|
|
|
In-place version of :meth:`__add__`; turns this :class:`AddressList` instance
|
|
|
|
into the union of itself and the right-hand instance, *alist*.
|
|
|
|
|
|
|
|
|
|
|
|
.. method:: AddressList.__sub__(alist)
|
|
|
|
|
|
|
|
Return a new :class:`AddressList` instance that contains every address in the
|
|
|
|
left-hand :class:`AddressList` operand that is not present in the right-hand
|
|
|
|
address operand (set difference).
|
|
|
|
|
|
|
|
|
|
|
|
.. method:: AddressList.__isub__(alist)
|
|
|
|
|
|
|
|
In-place version of :meth:`__sub__`, removing addresses in this list which are
|
|
|
|
also in *alist*.
|
|
|
|
|
|
|
|
Finally, :class:`AddressList` instances have one public instance variable:
|
|
|
|
|
|
|
|
|
|
|
|
.. attribute:: AddressList.addresslist
|
|
|
|
|
|
|
|
A list of tuple string pairs, one per address. In each member, the first is the
|
|
|
|
canonicalized name part, the second is the actual route-address (``'@'``\
|
|
|
|
-separated username-host.domain pair).
|
|
|
|
|
|
|
|
.. rubric:: Footnotes
|
|
|
|
|
|
|
|
.. [#] This module originally conformed to :rfc:`822`, hence the name. Since then,
|
|
|
|
:rfc:`2822` has been released as an update to :rfc:`822`. This module should be
|
|
|
|
considered :rfc:`2822`\ -conformant, especially in cases where the syntax or
|
|
|
|
semantics have changed since :rfc:`822`.
|
|
|
|
|