Only send Xref: as additional header in XOVER
This commit is contained in:
parent
10f1e05f1a
commit
15c50424aa
1 changed files with 9 additions and 17 deletions
|
@ -649,32 +649,24 @@ class Session(Connection):
|
||||||
int_bytes = len(bytes(message.content, 'utf-8'))
|
int_bytes = len(bytes(message.content, 'utf-8'))
|
||||||
int_lines = message.body.count('\n') - 2
|
int_lines = message.body.count('\n') - 2
|
||||||
|
|
||||||
|
def _or(a, b):
|
||||||
|
return a if a is not None else b
|
||||||
|
|
||||||
|
xref = message.headers.get('Xref')
|
||||||
|
|
||||||
parts = [
|
parts = [
|
||||||
str(message.id),
|
str(message.id),
|
||||||
email.header.Header(message.subject).encode(),
|
email.header.Header(message.subject).encode(),
|
||||||
email.header.Header(message.sender).encode(),
|
email.header.Header(message.sender).encode(),
|
||||||
email.utils.format_datetime(message.created_on),
|
email.utils.format_datetime(message.created_on),
|
||||||
message.message_id,
|
_or(message.message_id, ''),
|
||||||
message.reference_ids or '',
|
_or(message.reference_ids, ''),
|
||||||
str(int_bytes),
|
str(int_bytes),
|
||||||
str(int_lines),
|
str(int_lines),
|
||||||
]
|
]
|
||||||
|
|
||||||
HEADERS_SKIP = {
|
if xref is not None:
|
||||||
'subject': True,
|
parts.append('Xref: %s' % xref)
|
||||||
'from': True,
|
|
||||||
'date': True,
|
|
||||||
'message-id': True,
|
|
||||||
'references': True,
|
|
||||||
}
|
|
||||||
|
|
||||||
for k in message.headers:
|
|
||||||
if k.casefold() in HEADERS_SKIP:
|
|
||||||
continue
|
|
||||||
|
|
||||||
parts.append("%s: %s" % (
|
|
||||||
k, message.headers[k]
|
|
||||||
))
|
|
||||||
|
|
||||||
return map(f, parts)
|
return map(f, parts)
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue