Changeset 347

Timestamp:

04/12/10 15:32:46 (13 years ago)

Author:

bas

Message:

email2trac.py.in:

• re-enabled normalizing for filenames (attachments)

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• email2trac.py.in (modified) (2 diffs)

trunk/ChangeLog

@@ +1 @@
+2010-XX-XX
+
+
 2010-03-20
 

trunk/email2trac.py.in

@@ -1486 +1486 @@
                                 filename = '%s%s' % (filename, ext)
 
-# We now use the attachment insert function
-#
                         ## Discard relative paths in attachment names
                         #
-                        #filename = filename.replace('\\', '/').replace(':', '/') 
-                        #filename = os.path.basename(filename)
+                        filename = filename.replace('\\', '/').replace(':', '/') 
+                        filename = os.path.basename(filename)
+
                         #
                         # We try to normalize the filename to utf-8 NFC if we can.
@@ -1497 +1496 @@
                         # Check python version and then try it
                         #
-                        #if sys.version_info[0] > 2 or (sys.version_info[0] == 2 and sys.version_info[1] >= 3):
-                        #       try:
-                        #               filename = unicodedata.normalize('NFC', unicode(filename, 'utf-8')).encode('utf-8')  
-                        #       except TypeError:
-                        #               pass
+                        if sys.version_info[0] > 2 or (sys.version_info[0] == 2 and sys.version_info[1] >= 3):
+                                try:
+                                        filename = unicodedata.normalize('NFC', unicode(filename, 'utf-8')).encode('utf-8')  
+                                except TypeError:
+                                        pass
 
                         # Make the filename unique for this ticket