diff options
| author | Larry Hastings <larry@hastings.org> | 2014-05-18 04:05:10 (GMT) |
|---|---|---|
| committer | Larry Hastings <larry@hastings.org> | 2014-05-18 04:05:10 (GMT) |
| commit | 3a260d228b32b04a88d947b887bf81759e8e5f10 (patch) | |
| tree | e4a34e9cbbf877cf021ffba743ddbf54e17526b7 /Lib/email | |
| parent | 2110603344316d927e6d639275c12f5da78601d5 (diff) | |
| parent | b1a1ec3151155a1ae65831793b4a5b7a87d9d09f (diff) | |
| download | cpython-3a260d228b32b04a88d947b887bf81759e8e5f10.zip cpython-3a260d228b32b04a88d947b887bf81759e8e5f10.tar.gz cpython-3a260d228b32b04a88d947b887bf81759e8e5f10.tar.bz2 | |
Merge.
Diffstat (limited to 'Lib/email')
| -rw-r--r-- | Lib/email/generator.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Lib/email/generator.py b/Lib/email/generator.py index 1535210..4735721 100644 --- a/Lib/email/generator.py +++ b/Lib/email/generator.py @@ -51,8 +51,9 @@ class Generator: by RFC 2822. The policy keyword specifies a policy object that controls a number of - aspects of the generator's operation. The default policy maintains - backward compatibility. + aspects of the generator's operation. If no policy is specified, + the policy associated with the Message object passed to the + flatten method is used. """ self._fp = outfp @@ -76,7 +77,9 @@ class Generator: Note that for subobjects, no From_ line is printed. linesep specifies the characters used to indicate a new line in - the output. The default value is determined by the policy. + the output. The default value is determined by the policy specified + when the Generator instance was created or, if none was specified, + from the policy associated with the msg. """ # We use the _XXX constants for operating on data that comes directly |