mirror of
https://github.com/python/cpython.git
synced 2024-11-29 00:56:12 +01:00
bb11386730
Briefly (from the NEWS file):
- Updates for the email package:
+ All deprecated APIs that in email 2.x issued warnings have been removed:
_encoder argument to the MIMEText constructor, Message.add_payload(),
Utils.dump_address_pair(), Utils.decode(), Utils.encode()
+ New deprecations: Generator.__call__(), Message.get_type(),
Message.get_main_type(), Message.get_subtype(), the 'strict' argument to
the Parser constructor. These will be removed in email 3.1.
+ Support for Python earlier than 2.3 has been removed (see PEP 291).
+ All defect classes have been renamed to end in 'Defect'.
+ Some FeedParser fixes; also a MultipartInvariantViolationDefect will be
added to messages that claim to be multipart but really aren't.
+ Updates to documentation.
79 lines
2.1 KiB
Python
79 lines
2.1 KiB
Python
# Copyright (C) 2001-2004 Python Software Foundation
|
||
# Author: Barry Warsaw
|
||
# Contact: email-sig@python.org
|
||
|
||
"""Encodings and related functions."""
|
||
|
||
import base64
|
||
from quopri import encodestring as _encodestring
|
||
|
||
def _qencode(s):
|
||
enc = _encodestring(s, quotetabs=True)
|
||
# Must encode spaces, which quopri.encodestring() doesn't do
|
||
return enc.replace(' ', '=20')
|
||
|
||
|
||
def _bencode(s):
|
||
# We can't quite use base64.encodestring() since it tacks on a "courtesy
|
||
# newline". Blech!
|
||
if not s:
|
||
return s
|
||
hasnewline = (s[-1] == '\n')
|
||
value = base64.encodestring(s)
|
||
if not hasnewline and value[-1] == '\n':
|
||
return value[:-1]
|
||
return value
|
||
|
||
|
||
|
||
def encode_base64(msg):
|
||
"""Encode the message's payload in Base64.
|
||
|
||
Also, add an appropriate Content-Transfer-Encoding header.
|
||
"""
|
||
orig = msg.get_payload()
|
||
encdata = _bencode(orig)
|
||
msg.set_payload(encdata)
|
||
msg['Content-Transfer-Encoding'] = 'base64'
|
||
|
||
|
||
|
||
def encode_quopri(msg):
|
||
"""Encode the message's payload in quoted-printable.
|
||
|
||
Also, add an appropriate Content-Transfer-Encoding header.
|
||
"""
|
||
orig = msg.get_payload()
|
||
encdata = _qencode(orig)
|
||
msg.set_payload(encdata)
|
||
msg['Content-Transfer-Encoding'] = 'quoted-printable'
|
||
|
||
|
||
|
||
def encode_7or8bit(msg):
|
||
"""Set the Content-Transfer-Encoding header to 7bit or 8bit."""
|
||
orig = msg.get_payload()
|
||
if orig is None:
|
||
# There's no payload. For backwards compatibility we use 7bit
|
||
msg['Content-Transfer-Encoding'] = '7bit'
|
||
return
|
||
# We play a trick to make this go fast. If encoding to ASCII succeeds, we
|
||
# know the data must be 7bit, otherwise treat it as 8bit.
|
||
try:
|
||
orig.encode('ascii')
|
||
except UnicodeError:
|
||
# iso-2022-* is non-ASCII but still 7-bit
|
||
charset = msg.get_charset()
|
||
output_cset = charset and charset.output_charset
|
||
if output_cset and output_cset.lower().startswith('iso-2202-'):
|
||
msg['Content-Transfer-Encoding'] = '7bit'
|
||
else:
|
||
msg['Content-Transfer-Encoding'] = '8bit'
|
||
else:
|
||
msg['Content-Transfer-Encoding'] = '7bit'
|
||
|
||
|
||
|
||
def encode_noop(msg):
|
||
"""Do nothing."""
|