Changeset 379

Timestamp:

06/22/10 13:22:33 (13 years ago)

Author:

bas

Message:

email2trac.py.in:

• added print_unicode function. So we can delete some code lines,

File:

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

trunk/email2trac.py.in

@@ -517 +517 @@
                         n = n + 1
                         print 'TD: part%d: Content-Type: %s' % (n, part.get_content_type())
-                        
-                        try:
-                                print 'TD: part%d: filename: %s' % (n, filename)
-                        except UnicodeEncodeError, detail:
-                                print 'TD: part%d: filename: %s' % (n, util.text.unicode_quote(filename))
-
+                
+                        s = 'TD: part%d: filename: %s' %(n, filename)
+                        self.print_unicode(s)
+        
                         ## Forbidden chars
                         #
@@ -530 +528 @@
 
                         part_file = os.path.join(self.TMPDIR, filename)
-                        try:
-                                print 'TD: writing part%d (%s)' % (n,part_file)
-                        except UnicodeEncodeError, detail:
-                                print 'TD: writing part%d (%s)' % (n, util.text.unicode_quote(part_file))
+                        s = 'TD: writing part%d (%s)' % (n,part_file)
+                        self.print_unicode(s)
 
                         if self.DRY_RUN:
@@ -594 +590 @@
                 if self.VERBOSE:
                         print "VB: email_to_unicode"
-
-
 
                 results =  email.Header.decode_header(message_str)
@@ -652 +646 @@
                 return result
 
+        def print_unicode(self,s):
+                """
+                This function prints unicode strings uif possible else it will quote it
+                """
+                try:
+                        print s
+                except UnicodeEncodeError, detail:
+                        print util.text.unicode_quote(s)
+
 ########## TRAC ticket functions  ###########################################################
 
@@ -685 +688 @@
                 for field,value in user_dict.items():
                         if self.DEBUG >= 10: 
-                                try:
-                                        print  'user_field\t %s = %s' %(field,value)
-                                except UnicodeEncodeError, detail:
-                                        print  'user_field\t %s = %s' %(field, util.text.unicode_quote(value))
+                                s = 'TD: user_field\t %s = %s' %(field,value) 
+                                self.print_unicode(s)
 
                         ## To prevent mail loop
@@ -727 +728 @@
 
                                 if self.DEBUG >= 10: 
-                                        try:
-                                                print  'ticket_field\t %s = %s' %(field,  ticket[field])
-                                        except UnicodeEncodeError, detail:
-                                                print  'ticket_field\t %s = %s' %(field,  util.text.unicode_quote(ticket[field]))
+                                        s = 'ticket_field\t %s = %s' %(field,  ticket[field]) 
+                                        self.print_unicode(s)
 
         def ticket_update(self, m, id, spam):
@@ -891 +890 @@
         
                         if self.DEBUG > 10:
-                                try:
-                                        print 'TD: trac.ini name %s = %s' %(name, value)
-                                except UnicodeEncodeError, detail:
-                                        print 'TD: trac.ini name %s = %s' %(name, util.text.unicode_quote(value))
+                                s = 'TD: trac.ini name %s = %s' %(name, value)
+                                self.print_unicode(s)
 
                         ## email2trac.conf settings
@@ -902 +899 @@
                                 value = self.parameters['%s_%s' %(prefix, name)]
                                 if self.DEBUG > 10:
-                                        try:
-                                                print 'TD: email2trac.conf %s = %s ' %(name, value)
-                                        except UnicodeEncodeError, detail:
-                                                print 'TD: email2trac.conf %s = %s ' %(name, util.text.unicode_quote(value))
+                                        s = 'TD: email2trac.conf %s = %s ' %(name, value)
+                                        self.print_unicode(s)
 
                         except KeyError, detail:
@@ -911 +906 @@
                 
                         if self.DEBUG:
-                                try:
-                                        print 'user_dict[%s] = %s' %(name, value)
-                                except UnicodeEncodeError, detail:
-                                        print 'user_dict[%s] = %s' %(name, util.text.unicode_quote(value))
+                                s = 'TD: user_dict[%s] = %s' %(name, value)
+                                self.print_unicode(s)
 
                         if value:
@@ -1785 +1778 @@
                         else:
                                 if self.DEBUG:
-                                        try:
-                                                print 'TD:               Filename: %s' % part.get_filename()
-                                        except UnicodeEncodeError, detail:
-                                                print 'TD:               Filename: %s' % util.text.unicode_quote(part.get_filename())
+                                        s = 'TD:               Filename: %s' % part.get_filename()
+                                        self.print_unicode(s)
 
                                 ##
@@ -1855 +1846 @@
                                 
                         if self.DEBUG:
-                                try:
-                                        print 'TD: Attachment with filename %s will be saved as %s' % (filename, unique_filename)
-                                except UnicodeEncodeError, detail:
-                                        print 'Filename can not be printed due to non-ascii characters'
+                                s = 'TD: Attachment with filename %s will be saved as %s' % (filename, unique_filename)
+                                self.print_unicode(s)
 
                         attachment_names.add(unique_filename)
@@ -1870 +1859 @@
 
                 if self.DEBUG:
-                        s = 'TD: attachment already exists: Id : '
-                        try:
-                                print "%s%s, Filename : %s" % (s, self.id, filename)
-                        except UnicodeEncodeError, detail:
-                                print "%s%s, Filename : Can not be printed due to non-ascii characters" %(s, self.id)
+                        s = 'TD: attachment already exists: Id : %s, Filename : %s' %(self.id, filename)
+                        self.print_unicode(s)
 
                 # We have no valid ticket id