Changeset 331

Timestamp:

03/23/10 16:57:23 (14 years ago)

Author:

bas

Message:

disabled writing files for Dry-run mode
Debug mode can now handle printing of non-ascii chararacters. We just inform the user that it can not be displayed, see #184

Location:

trunk

Files:

• debian/changelog (modified) (2 diffs)
• email2trac.py.in (modified) (9 diffs)

trunk/debian/changelog

@@ -1 @@
-email2trac (1.3.0-1) stable; urgency=low
+email2trac (1.3.0-2) stable; urgency=low
 
   * Added environment variable INSTALL_USER check. If set then use
@@ -20 +20 @@
     Fixed by: Bas van der Vlies
 
+  * We do not write any files when dry run mode is enabled.
+    Fixed by: Bas van der Vlies
+
+  * Fixed several issues when DEBUG is enabled with printing no-ascii 
+    characters, see #184
+    Reported by: hju add jochenkuhl dot de
+    Fixed by: Bas van der Vlies
+  
  -- Bas van der Vlies <basv@sara.nl>  Wed, 03 Mar 2010 15:50:35 +0100
 

trunk/email2trac.py.in

@@ -503 +503 @@
                         body_file = os.path.join(self.TMPDIR, 'body.txt')
 
-                print 'TD: writing body (%s)' % body_file
-                fx = open(body_file, 'wb')
+                if self.DRY_RUN:
+                        print 'DRY-RUN: not saving body to %s' %(body_file)
+                        return
+
+                print 'TD: writing body to %s' %(body_file)
+                fx = open(body_file, 'wb') 
                 if not message_body:
-                        message_body = '(None)'
+                                message_body = '(None)'
 
                 message_body = message_body.encode('utf-8')
@@ -525 +529 @@
                 
                 n = 0
-                for part in message_parts:
+                for item in message_parts:
                         # Skip inline text parts
-                        if not isinstance(part, tuple):
+                        if not isinstance(item, tuple):
                                 continue
                                 
-                        (original, filename, part) = part
+                        (original, filename, part) = item
 
                         n = n + 1
@@ -536 +540 @@
                         print 'TD: part%d: filename: %s' % (n, part.get_filename())
 
-                        part_file = os.path.join(self.TMPDIR, filename)
-                        #part_file = '/var/tmp/part%d' % n
+                        part_file = os.path.join(self.TMPDIR, part.get_filename())
                         print 'TD: writing part%d (%s)' % (n,part_file)
+
+                        if self.DRY_RUN:
+                                print 'DRY_RUN: NOT saving attachments'
+                                continue
+
                         fx = open(part_file, 'wb')
                         text = part.get_payload(decode=1)
+
                         if not text:
                                 text = '(None)'
+
                         fx.write(text)
                         fx.close()
+
                         try:
                                 os.chmod(part_file,S_IRWXU|S_IRWXG|S_IRWXO)
@@ -559 +570 @@
                         msg_file = os.path.join(self.TMPDIR, 'msg.txt')
 
-                print 'TD: saving email to %s' % msg_file
-                fx = open(msg_file, 'wb')
-                fx.write('%s' % message)
-                fx.close()
-                try:
-                        os.chmod(msg_file,S_IRWXU|S_IRWXG|S_IRWXO)
-                except OSError:
-                        pass
+                if self.DRY_RUN:
+                        print 'DRY_RUN: NOT saving email message to %s' %(msg_file)
+                else:
+                        print 'TD: saving email to %s' %(msg_file)
+
+                        fx = open(msg_file, 'wb')
+                        fx.write('%s' % message)
+                        fx.close()
+                        
+                        try:
+                                os.chmod(msg_file,S_IRWXU|S_IRWXG|S_IRWXO)
+                        except OSError:
+                                pass
 
                 message_parts = self.get_message_parts(message)
@@ -1058 +1074 @@
                         blog_enabled = True
 
-                print m['Subject']      
                 if not m['Subject']:
                         subject  = 'No Subject'
@@ -1326 +1341 @@
                                                 print 'TD:               Filename: %s' % part.get_filename()
                                         except UnicodeEncodeError, detail:
-                                                print 'TD:               Filename: Can not be printed due to non-ascci characters'
+                                                print 'TD:               Filename: Can not be printed due to non-ascii characters'
 
                                 ## Convert 7-bit filename to 8 bits value
@@ -1341 +1356 @@
                 attachment_names = set()
 
-                for part in message_parts:
+                for item in message_parts:
                         
                         ## If not an attachment, leave it alone
                         #
-                        if not isinstance(part, tuple):
-                                renamed_parts.append(part)
+                        if not isinstance(item, tuple):
+                                renamed_parts.append(item)
                                 continue
                                 
-                        (filename, part) = part
+                        (filename, part) = item
 
                         ## If no filename, use a default one
@@ -1393 +1408 @@
                                 
                         if self.DEBUG:
-                                print 'TD: Attachment with filename %s will be saved as %s' % (filename, unique_filename)
+                                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'
 
                         attachment_names.add(unique_filename)
@@ -1408 +1426 @@
 
                 if self.DEBUG:
-                        print "TD: attachment_exists: Ticket number : %s, Filename : %s" %(self.id, filename)
+                        s = 'TD: attachment already exists: Ticket 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)
 
                 # We have no valid ticket id