Changeset 288 for trunk/email2trac.py.in

Timestamp:

10/22/09 18:02:24 (13 years ago)

Author:

bas

Message:

email2trac.py.in:

• workflow patch, did not work, closes #157
• When i ticket is updated we did supply all need fields, like ticket change number, closes #156

debian/changelog:

• new list of changes

File:

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

trunk/email2trac.py.in

@@ -130 +130 @@
                 self.email_addr = None
                 self.email_from = None
-                self.author     = Nome
+                self.author     = None
                 self.id         = None
 
@@ -344 +344 @@
                 """
                 results =  email.Header.decode_header(message_str)
-                str = None
+                s = None
                 for text,format in results:
                         if format:
@@ -362 +362 @@
                                 temp = unicode(text, 'iso-8859-15')
 
-                        if str:
-                                str = '%s %s' %(str, temp)
+                        if s:
+                                s = '%s %s' %(s, temp)
                         else:
-                                str = '%s' %temp
-
-                #str = str.encode('utf-8')
-                return str
+                                s = '%s' %temp
+
+                #s = s.encode('utf-8')
+                return s
 
         def debug_body(self, message_body, tempfile=False):
@@ -423 +423 @@
                 Display To and CC addresses in description field
                 """
-                str = ''
+                s = ''
                 #if m['To'] and len(m['To']) > 0 and m['To'] != 'hic@sara.nl':
                 if m['To'] and len(m['To']) > 0:
-                        str = "'''To:''' %s\r\n" %(m['To'])
+                        s = "'''To:''' %s\r\n" %(m['To'])
                 if m['Cc'] and len(m['Cc']) > 0:
-                        str = "%s'''Cc:''' %s\r\n" % (str, m['Cc'])
-
-                return  self.email_to_unicode(str)
+                        s = "%s'''Cc:''' %s\r\n" % (s, m['Cc'])
+
+                return  self.email_to_unicode(s)
 
 
@@ -519 +519 @@
                         pass
 
-        def str_to_dict(self, str):
-                """
-                Transfrom a str of the form [<key>=<value>]+ to dict[<key>] = <value>
+        def str_to_dict(self, s):
+                """
+                Transfrom a string of the form [<key>=<value>]+ to dict[<key>] = <value>
                 """ 
 
-                fields = string.split(str, ',')
+                fields = string.split(s, ',')
 
                 result = dict()
@@ -643 +643 @@
                         return False
 
+                # How many changes has this ticket
+                cnum = len(tkt.get_changelog())
+
+
                 # reopen the ticket if it is was closed
                 # We must use the ticket workflow framework
@@ -662 +666 @@
                         #print 'get_ticket_changes :', b
 
-                        if self.WORKFLOW and (self.VERSION in ['0.11']) :
+                        if self.WORKFLOW and (self.VERSION in [0.11]) :
                                 from trac.ticket.default_workflow import ConfigurableTicketWorkflow
                                 from trac.test import Mock, MockPerm
@@ -696 +700 @@
                 if body_text.strip() or update_fields:
                         if self.DRY_RUN:
-                                print 'DRY_RUN: tkt.save_changes(self.author, comment) ', self.author
+                                print 'DRY_RUN: tkt.save_changes(self.author, body_text, ticket_change_number) ', self.author, cnum
                         else:
-                                tkt.save_changes(self.author, body_text, when)
+                                #tkt.save_changes(self.author, body_text, when)
+                                tkt.save_changes(self.author, body_text, when, None, str(cnum))
+                                a =1
+                        
 
                 if self.VERSION  == 0.9:
-                        str = self.attachments(message_parts, True)
-                else:
-                        str = self.attachments(message_parts)
+                        s = self.attachments(message_parts, True)
+                else:
+                        s = self.attachments(message_parts)
 
                 if self.notification and not spam:
@@ -838 +845 @@
                                 %(head, mailto, body_text)
 
-                str =  self.attachments(message_parts)
-                if str:
+                has_attachments =  self.attachments(message_parts)
+                if has_attachments:
                         changed = True
-                        comment = '%s\n%s\n' %(comment, str)
+                        comment = '%s\n%s\n' %(comment, has_attachments)
 
                 if changed:
@@ -1376 +1383 @@
                 # use urllib to escape the chars
                 #
-                str = 'mailto:%s?Subject=%s&Cc=%s' %( 
+                s = 'mailto:%s?Subject=%s&Cc=%s' %( 
                        urllib.quote(self.email_addr), 
                            urllib.quote('Re: #%s: %s' %(self.id, subject)),
@@ -1382 +1389 @@
                            )
 
-                str = '\r\n{{{\r\n#!html\r\n<a\r\n href="%s">Reply to: %s\r\n</a>\r\n}}}\r\n' %(str, author)
-                return str
+                s = '\r\n{{{\r\n#!html\r\n<a\r\n href="%s">Reply to: %s\r\n</a>\r\n}}}\r\n' %(str, author)
+                return s
 
         def attachments(self, message_parts, update=False):