summaryrefslogtreecommitdiffstats
path: root/Lib/email/generator.py
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2012-05-25 22:42:14 (GMT)
committerR David Murray <rdmurray@bitdance.com>2012-05-25 22:42:14 (GMT)
commit0b6f6c82b51b7071d88f48abb3192bf3dc2a2d24 (patch)
treed6bd5f56722b8fff6db8bdf39b47b1c4a87a3d42 /Lib/email/generator.py
parent0fa2edd08f7b2b028f61a22fab9a648d58699c0b (diff)
downloadcpython-0b6f6c82b51b7071d88f48abb3192bf3dc2a2d24.zip
cpython-0b6f6c82b51b7071d88f48abb3192bf3dc2a2d24.tar.gz
cpython-0b6f6c82b51b7071d88f48abb3192bf3dc2a2d24.tar.bz2
#12586: add provisional email policy with new header parsing and folding.
When the new policies are used (and only when the new policies are explicitly used) headers turn into objects that have attributes based on their parsed values, and can be set using objects that encapsulate the values, as well as set directly from unicode strings. The folding algorithm then takes care of encoding unicode where needed, and folding according to the highest level syntactic objects. With this patch only date and time headers are parsed as anything other than unstructured, but that is all the helper methods in the existing API handle. I do plan to add more parsers, and complete the set specified in the RFC before the package becomes stable.
Diffstat (limited to 'Lib/email/generator.py')
-rw-r--r--Lib/email/generator.py11
1 files changed, 9 insertions, 2 deletions
diff --git a/Lib/email/generator.py b/Lib/email/generator.py
index bfa288b..fcecf93 100644
--- a/Lib/email/generator.py
+++ b/Lib/email/generator.py
@@ -95,9 +95,15 @@ class Generator:
self._encoded_NL = self._encode(self._NL)
self._EMPTY = ''
self._encoded_EMTPY = self._encode('')
- p = self.policy
+ # Because we use clone (below) when we recursively process message
+ # subparts, and because clone uses the computed policy (not None),
+ # submessages will automatically get set to the computed policy when
+ # they are processed by this code.
+ old_gen_policy = self.policy
+ old_msg_policy = msg.policy
try:
self.policy = policy
+ msg.policy = policy
if unixfrom:
ufrom = msg.get_unixfrom()
if not ufrom:
@@ -105,7 +111,8 @@ class Generator:
self.write(ufrom + self._NL)
self._write(msg)
finally:
- self.policy = p
+ self.policy = old_gen_policy
+ msg.policy = old_msg_policy
def clone(self, fp):
"""Clone this generator with the exact same options."""