Changeset 291

Timestamp:

12/06/05 08:50:58 (19 years ago)

Author:

jerome

Message:

Better cleanup for temporary tiff file

Files:

• pkpgcounter/trunk/pkpgpdls/postscript.py (modified) (1 diff)

pkpgcounter/trunk/pkpgpdls/postscript.py

@@ -176 +176 @@
         os.close(handle)
         command = 'gs -sDEVICE=tiff24nc -dPARANOIDSAFER -dNOPAUSE -dBATCH -dQUIET -r%i -sOutputFile="%s" -' % (dpi, filename)
-        child = popen2.Popen4(command)
-        try :
-            data = self.infile.read(pdlparser.MEGABYTE)    
-            while data :
-                child.tochild.write(data)
-                data = self.infile.read(pdlparser.MEGABYTE)
-            child.tochild.flush()
-            child.tochild.close()    
-        except (IOError, OSError), msg :    
-            raise pdlparser.PDLParserError, "Problem during conversion to TIFF : %s" % msg
-            
-        child.fromchild.close()
-        try :
-            child.wait()
-        except OSError, msg :    
-            raise pdlparser.PDLParserError, "Problem during conversion to TIFF : %s" % msg
-            
-        result = inkcoverage.getPercents(filename)    
-        try :
-            os.remove(filename)
-        except :    
-            pass
+        try :
+            child = popen2.Popen4(command)
+            try :
+                data = self.infile.read(pdlparser.MEGABYTE)    
+                while data :
+                    child.tochild.write(data)
+                    data = self.infile.read(pdlparser.MEGABYTE)
+                child.tochild.flush()
+                child.tochild.close()    
+            except (IOError, OSError), msg :    
+                raise pdlparser.PDLParserError, "Problem during conversion to TIFF : %s" % msg
+                
+            child.fromchild.close()
+            try :
+                child.wait()
+            except OSError, msg :    
+                raise pdlparser.PDLParserError, "Problem during conversion to TIFF : %s" % msg
+                
+            result = inkcoverage.getPercents(filename)    
+        finally :    
+            try :
+                os.remove(filename)
+            except :    
+                pass
+            result = None    
         return result    
-            
         
 def test() :