Changeset 258 in tailor for vcpx/svn.py

Timestamp:

04/18/05 17:22:05 (8 years ago)

Author:

zooko@…

Hash name:

20050418152205-92b7f-0e54d3d8f512f84d4520a227a8a0f26317601825

Message:

new tempfile idiom
advantages:

1. secure in all cases (previously there was one use of insecure mktemp)
2. automatically cleans up tempfiles when things are garbage collected
3. doesn't attempt to open a tempfile more than once at a time, which the python docs say won't work on some kinds of Windows.

File:

• vcpx/svn.py (modified) (4 diffs)

vcpx/svn.py

@@ -45 +45 @@
     COMMAND = "svn propset --quiet %(property)s %(value)s %(entry)s"
 
+import shutil, tempfile
+
+class ReopeableNamedTemporaryFile:
+    """
+    This uses tempfile.mkstemp() to generate a secure temp file.  It then closes
+    the file, leaving a zero-length file as a placeholder.  You can get the
+    filename with ReopenableNamedTemporaryFile.name.  When the
+    ReopenableNamedTemporaryFile instance is garbage collected or its shutdown()
+    method is called, it deletes the file.
+
+    Copied from Zooko's pyutil.fileutil, http://zooko.com/repos/pyutil
+    """
+    def __init__(self, suffix=None, prefix=None, dir=None, text=None):
+        self.name = mkstemp(suffix, prefix, dir, text)[1]
+      
+    def __del__(self):
+        self.shutdown()
+       
+    def shutdown(self):
+        os.remove(self.name)
 
 class SvnLog(SystemCommand):
@@ -51 +71 @@
     def __call__(self, output=None, dry_run=False, **kwargs):
         from tempfile import mktemp
-        from os import remove
         
         quiet = kwargs.get('quiet', True)
@@ -74 +93 @@
             kwargs['endrev'] = 'HEAD'
 
-        logfn = kwargs['tempfilename'] = mktemp('svn', 'tailor')
+        rontf = ReopenableNamedTemporaryFile('svn', 'tailor')
+        logfn = kwargs['tempfilename'] = rontf.name
         
         SystemCommand.__call__(self, output=False, dry_run=dry_run, **kwargs)
 
-        log = open(logfn)
-        if not SystemCommand.VERBOSE:
-            remove(logfn)
-            
-        return log
+        return open(logfn)
 
 
@@ -90 +106 @@
     def __call__(self, output=None, dry_run=False, **kwargs):
         logfile = kwargs.get('logfile')
+        rontf = ReopenableNamedTemporaryFile('svn', 'tailor')
         if not logfile:
-            from tempfile import NamedTemporaryFile
-
-            log = NamedTemporaryFile(bufsize=0)
             logmessage = kwargs.get('logmessage')
             if logmessage:
+                log = open(rontf.name, "w")
                 log.write(logmessage)
-            
-            kwargs['logfile'] = log.name
+                log.close()
+            
+            kwargs['logfile'] = rontf.name
         
         return SystemCommand.__call__(self, output=output,