瀏覽代碼

remove parsing of uneeded headers : date and mail_id

Guénaël Muller 7 年之前
父節點
當前提交
6ab184ed51
共有 2 個文件被更改,包括 0 次插入15 次删除
  1. 0 8
      tracim/tracim/lib/email_fetcher.py
  2. 0 7
      tracim/tracim/lib/test_email_fetcher.py

+ 0 - 8
tracim/tracim/lib/email_fetcher.py 查看文件

33
 
33
 
34
     try:
34
     try:
35
         mail_data['subject'] = str_header(msg['subject'])
35
         mail_data['subject'] = str_header(msg['subject'])
36
-        mail_data['msg_id'] = str_header(msg['Message-ID'])
37
         mail_data['from'] = parseaddr(msg['From'])[1]
36
         mail_data['from'] = parseaddr(msg['From'])[1]
38
         # Reply key
37
         # Reply key
39
         mail_data['to'] = parseaddr(msg['To'])[1]
38
         mail_data['to'] = parseaddr(msg['To'])[1]
42
         mail_data['references'] = parseaddr(msg['References'])[1]
41
         mail_data['references'] = parseaddr(msg['References'])[1]
43
         if TRACIM_SPECIAL_KEY_HEADER in msg:
42
         if TRACIM_SPECIAL_KEY_HEADER in msg:
44
             mail_data[TRACIM_SPECIAL_KEY_HEADER] = str_header(msg[TRACIM_SPECIAL_KEY_HEADER])  # nopep8
43
             mail_data[TRACIM_SPECIAL_KEY_HEADER] = str_header(msg[TRACIM_SPECIAL_KEY_HEADER])  # nopep8
45
-        # date
46
-        date_h = str_header(msg['Date'])
47
-        date_tuple = parsedate_tz(date_h)
48
-
49
-        mail_data['date'] = datetime.datetime.fromtimestamp(
50
-            mktime_tz(date_tuple)
51
-        )
52
 
44
 
53
     except Exception:
45
     except Exception:
54
         # FIXME - G.M - 2017-11-15 - handle exceptions correctly
46
         # FIXME - G.M - 2017-11-15 - handle exceptions correctly

+ 0 - 7
tracim/tracim/lib/test_email_fetcher.py 查看文件

13
     msg['Subject'] = "test"
13
     msg['Subject'] = "test"
14
     #msg.add_header('Reply-To', '<a+key@home>')
14
     #msg.add_header('Reply-To', '<a+key@home>')
15
     msg.add_header('References', '<reply+key@home>')
15
     msg.add_header('References', '<reply+key@home>')
16
-    msg.add_header('Message-ID', '<uniquevalue@home>')
17
-    msg.add_header('Date', 'Wed, 8 Nov 2017 15:21:10 +0100')
18
     msg.add_header(TRACIM_SPECIAL_KEY_HEADER, 'key')
16
     msg.add_header(TRACIM_SPECIAL_KEY_HEADER, 'key')
19
     maildata=decode_mail(msg)
17
     maildata=decode_mail(msg)
20
-    # same format for date
21
-    date_tuple = parsedate_tz('Wed, 8 Nov 2017 15:21:10 +0100')
22
-    date = datetime.datetime.fromtimestamp(mktime_tz(date_tuple))
23
 
18
 
24
     assert maildata == {
19
     assert maildata == {
25
         TRACIM_SPECIAL_KEY_HEADER: 'key',
20
         TRACIM_SPECIAL_KEY_HEADER: 'key',
27
         'to': 'b@home',
22
         'to': 'b@home',
28
         'subject':'test',
23
         'subject':'test',
29
         'references':'reply+key@home',
24
         'references':'reply+key@home',
30
-        'msg_id': '<uniquevalue@home>',
31
-        'date': date
32
     }
25
     }
33
 # get_tracim_content_key
26
 # get_tracim_content_key
34
 
27