Changeset 377

Timestamp:

06/22/10 10:25:37 (14 years ago)

Author:

bas

Message:

Fixed some issues with Unicode suport for attachments, see #206

File:

• trunk/email2trac.py.in (modified) (5 diffs)

trunk/email2trac.py.in

@@ -521 +521 @@
                                 print 'TD: part%d: filename: %s' % (n, filename)
                         except UnicodeEncodeError, detail:
-                                print 'Filename can not be printed due to non-ascii characters'
+                                print 'TD: part%d: filename: %s' % (n, util.text.unicode_quote(filename))
 
                         ## Forbidden chars
@@ -533 +533 @@
                                 print 'TD: writing part%d (%s)' % (n,part_file)
                         except UnicodeEncodeError, detail:
-                                print 'Filename can not be printed due to non-ascii characters'
+                                print 'TD: writing part%d (%s)' % (n, util.text.unicode_quote(part_file))
 
                         if self.DRY_RUN:
                                 print 'DRY_RUN: NOT saving attachments'
                                 continue
+
+                        part_file = util.text.unicode_quote(part_file)
 
                         fx = open(part_file, 'wb')
@@ -592 +594 @@
                 if self.VERBOSE:
                         print "VB: email_to_unicode"
+
+
 
                 results =  email.Header.decode_header(message_str)
@@ -1096 +1100 @@
                         (original, filename, part) = item
                         #
-                        # Must be tuneables HvB
-                        #
-                        path, fd =  util.create_unique_file(os.path.join(self.TMPDIR, filename))
+                        # We have to determine the size so we use this temporary solution. we must escape it
+                        # else we get UnicodeErrors. 
+                        #
+                        path, fd =  util.create_unique_file(os.path.join(self.TMPDIR, util.text.unicode_quote(filename)))
                         text = part.get_payload(decode=1)
                         if not text:
@@ -1768 +1773 @@
                                                 print 'TD:               Filename: %s' % part.get_filename()
                                         except UnicodeEncodeError, detail:
-                                                print 'TD:               Filename: Can not be printed due to non-ascii characters'
-
-                                ## Convert 7-bit filename to 8 bits value
+                                                print 'TD:               Filename: %s' % util.text.unicode_quote(part.get_filename())
+
+                                ##
                                 #
-                                filename = self.email_to_unicode(part.get_filename())
+                                filename = part.get_filename()
                                 message_parts.append((filename, part))