Changeset 52

Timestamp:

03/09/10 01:52:55 (5 months ago)

Author:

sgk

Message:

Allow '㍑' character.

Files:

• python/ml/ml.py (modified) (2 diffs)

python/ml/ml.py

@@ -5 +5 @@
 ml.py -- simple mailing list to just distribute messages in a group.
 
-Copyright (c) 2007 Shigeru KANEMOTO
+Copyright (c) 2007,2010 Shigeru KANEMOTO
 All rights reserved.
 '''
@@ -87 +87 @@
     if m.get_content_maintype() != 'text':
       return
-    charset = m.get_content_charset()
-    body = m.get_payload()
-    if charset:
+    charset = m.get_content_charset().lower()
+    body = m.get_payload(i=None, decode=True)
+
+    # Decode
+    if charset == 'iso-2022-jp':
+      #XXX 「㍑」対応
+      body = body.replace('\x1b$B', '\x1b$(Q').decode('iso-2022-jp-2004')
+    else:
       body = body.decode(charset)
+
+    # Insert
     if m.get_content_subtype() == 'html':
       body = re.sub(r'^(.*<(body|BODY).*>|)', r'\1[%s]<br />' % nickname, body, 1)
     else:
       body = ('[%s]\r\n' % nickname) + body
-    if charset:
-      body = body.encode(charset)
-    m.set_payload(body)
+
+    # Encode
+    #XXX 「㍑」対応
+    body = body.encode('iso-2022-jp-2004').replace('\033$(Q', '\033$B')
+    del m['content-transfer-encoding']
+    m.set_payload(body, 'iso-2022-jp')
 
   if message.is_multipart():