浏览代码

Better import

Guénaël Muller 7 年前
父节点
当前提交
72fd9aea89
共有 1 个文件被更改,包括 12 次插入9 次删除
  1. 12 9
      tracim/tracim/lib/email_fetcher.py

+ 12 - 9
tracim/tracim/lib/email_fetcher.py 查看文件

1
-from email.message import Message
2
-from typing import Union
3
 import sys
1
 import sys
4
 import time
2
 import time
5
 import imaplib
3
 import imaplib
6
-import email
7
-import email.header
4
+import datetime
5
+import json
6
+from typing import Union
7
+from email.message import Message
8
 from email.header import Header, decode_header, make_header
8
 from email.header import Header, decode_header, make_header
9
+from email.utils import formataddr,parsedate_tz,mktime_tz
10
+from email import message_from_bytes
11
+
9
 import requests
12
 import requests
10
-import datetime
13
+
11
 from tracim.controllers.events import VALID_TOKEN_VALUE
14
 from tracim.controllers.events import VALID_TOKEN_VALUE
12
-import json
15
+
13
 
16
 
14
 TRACIM_SPECIAL_KEY_HEADER="X-Tracim-Key"
17
 TRACIM_SPECIAL_KEY_HEADER="X-Tracim-Key"
15
 
18
 
35
             mailData[TRACIM_SPECIAL_KEY_HEADER] = str_header(msg[TRACIM_SPECIAL_KEY_HEADER])
38
             mailData[TRACIM_SPECIAL_KEY_HEADER] = str_header(msg[TRACIM_SPECIAL_KEY_HEADER])
36
         # date
39
         # date
37
         date_h = str_header(msg['Date'])
40
         date_h = str_header(msg['Date'])
38
-        date_tuple = email.utils.parsedate_tz(date_h)
41
+        date_tuple = parsedate_tz(date_h)
39
 
42
 
40
-        mailData['date'] = datetime.datetime.fromtimestamp(email.utils.mktime_tz(date_tuple))
43
+        mailData['date'] = datetime.datetime.fromtimestamp(mktime_tz(date_tuple))
41
 
44
 
42
     except Exception as e:
45
     except Exception as e:
43
         # TODO: exception -> mail not correctly formatted
46
         # TODO: exception -> mail not correctly formatted
152
                 for num in data[0].split():
155
                 for num in data[0].split():
153
                     rv, data = self._connection.fetch(num, '(RFC822)')
156
                     rv, data = self._connection.fetch(num, '(RFC822)')
154
                     if rv == 'OK':
157
                     if rv == 'OK':
155
-                        msg = email.message_from_bytes(data[0][1])
158
+                        msg = message_from_bytes(data[0][1])
156
                         self._mails.append(msg)
159
                         self._mails.append(msg)
157
                         ret = True
160
                         ret = True
158
                     else:
161
                     else: