Changeset 514 for trunk

Timestamp:

01/14/11 16:16:55 (12 years ago)

Author:

bas

Message:

changed tempfile.mktemp to tempfile.mkstemp

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• debian/changelog (modified) (1 diff)
• email2trac.py.in (modified) (7 diffs)
• email2trac.spec (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2.0.2 (2011-02-13)
+   * Use tempfile.mkstemp instead of tempfile.mktemp
+     Reported by: Dennis Stam (SARA)
+     Author: Bas van der Vlies
+
 2.0.1 (2011-02-12)
    * An email address can match multiple trac accounts, closes #218

trunk/debian/changelog

@@ +1 @@
+email2trac (2.0.2-1) stable; urgency=low
+
+  * see Changelog 
+
+ -- bas van der Vlies <bas@sara.nl>  Fri, 14 Jan 2011 16:04:21 +0100
+
+email2trac (2.0.1-4) stable; urgency=low
+
+  * added info message for syslog of charset not found 
+
+ -- bas van der Vlies <basv@sara.nl>  Wed, 12 Jan 2011 15:32:16 +0100
+
 email2trac (2.0.1-3) stable; urgency=low
 

trunk/email2trac.py.in

@@ -415 +415 @@
     def debug_body(self, message_body, temporary_file=False):
         if temporary_file:
-            body_file = tempfile.mktemp('.email2trac')
+            (fd, body_file) = tempfile.mkstemp('.email2trac')
+            fx = os.fdopen(fd, 'wb')
         else:
             body_file = os.path.join(self.parameters.tmpdir, 'body.txt')
+            fx = open(body_file, 'wb') 
 
         if self.parameters.dry_run:
@@ -424 +426 @@
 
         print 'writing body to %s' %(body_file)
-        fx = open(body_file, 'wb') 
         if not message_body:
                 message_body = '(None)'
@@ -490 +491 @@
 
         if create_tempfile:
-            msg_file = tempfile.mktemp('.email2trac')
+            (fd, msg_file) = tempfile.mkstemp('.email2trac')
+            fx = os.fdopen(fd, 'wb')
         else:
             #msg_file = '/var/tmp/msg.txt' 
             msg_file = os.path.join(self.parameters.tmpdir, 'msg.txt')
+            fx = open(msg_file, 'wb')
 
         if self.parameters.dry_run:
@@ -500 +503 @@
             print 'saving email to %s' %(msg_file)
 
-            fx = open(msg_file, 'wb')
             fx.write('%s' % message)
             fx.close()
@@ -537 +539 @@
                     temp = unicode(text, 'iso-8859-15')
                 except LookupError, detail:
-                    #text = 'ERROR: Could not find charset: %s, please install' %format
+                    msg = 'ERROR: Could not find charset: %s, please install' %format
+                    sys.logger.error(msg)
                     #temp = unicode(text, 'iso-8859-15')
                     temp = message_str
@@ -614 +617 @@
         parsed_data = None
         if self.parameters.html2text_cmd: 
-            tmp_file = tempfile.mktemp('email2trac.html')
+            (fd, tmp_file) = tempfile.mkstemp('email2trac.html')
+            f = os.fdopen(fd, 'w')
+
             cmd = '%s %s' %(self.parameters.html2text_cmd, tmp_file) 
             self.logger.debug('\t html2text conversion %s'%(cmd)) 
@@ -622 +627 @@
 
             else: 
-                f = open(tmp_file, "w+")
                 f.write(data)
                 f.close()

trunk/email2trac.spec

@@ -1 +1 @@
 Summary: Utilities for converting emails to trac tickets
 Name: email2trac
-Version: 2.0.1
+Version: 2.0.2
 Release: 1
 License: GPL