Changeset 259 in tailor

Timestamp:

04/18/05 18:19:55 (8 years ago)

Author:

lele@…

Hash name:

20050418161955-97f81-2178e866f307ee80cd2d0d0cafc247b46c5f2c2d

Message:

Revisited zooko's ReopenableNamedTemporaryFile? patch

Location:

vcpx

Files:

• cvsps.py (modified) (2 diffs)
• svn.py (modified) (4 diffs)
• shwrap.py (modified) (1 diff)
• cvs.py (modified) (4 diffs)

vcpx/cvsps.py

@@ -14 +14 @@
 __docformat__ = 'reStructuredText'
 
-from shwrap import SystemCommand, shrepr
+from shwrap import SystemCommand, shrepr, ReopenableNamedTemporaryFile
 from source import UpdatableSourceWorkingDir, ChangesetApplicationFailure, \
      InvocationError
@@ -172 +172 @@
             yield Changeset(**pset)
 
-import 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 CvspsWorkingDir(UpdatableSourceWorkingDir,

vcpx/svn.py

@@ -12 +12 @@
 __docformat__ = 'reStructuredText'
 
-from shwrap import SystemCommand, shrepr
+from shwrap import SystemCommand, shrepr, ReopenableNamedTemporaryFile
 from source import UpdatableSourceWorkingDir, \
      ChangesetApplicationFailure, GetUpstreamChangesetsFailure
@@ -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):
     COMMAND = "TZ=UTC svn log %(quiet)s %(xml)s --revision %(startrev)s:%(endrev)s %(entry)s > %(tempfilename)s 2>&1"
     
-    def __call__(self, output=None, dry_run=False, **kwargs):
-        from tempfile import mktemp
-        
+    def __call__(self, output=None, dry_run=False, **kwargs):      
         quiet = kwargs.get('quiet', True)
         if quiet == True:
@@ -93 +71 @@
             kwargs['endrev'] = 'HEAD'
 
-        rontf = ReopenableNamedTemporaryFile('svn', 'tailor')
-        logfn = kwargs['tempfilename'] = rontf.name
+        self.rontf = ReopenableNamedTemporaryFile('svn', 'tailor')
+        logfn = kwargs['tempfilename'] = self.rontf.name
         
         SystemCommand.__call__(self, output=False, dry_run=dry_run, **kwargs)
 
         return open(logfn)
-
 
 class SvnCommit(SystemCommand):
@@ -112 +89 @@
                 log = open(rontf.name, "w")
                 log.write(logmessage)
-                log.close()
-            
+                log.close()            
             kwargs['logfile'] = rontf.name
         

vcpx/shwrap.py

@@ -10 +10 @@
 from sys import stderr
 
+
 def shrepr(str):
     str = str.replace("'", "\\'")
     return "'" + str + "'"
+
+
+class ReopenableNamedTemporaryFile:
+    """
+    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):
+        from tempfile import mkstemp
+        
+        self.name = mkstemp(suffix, prefix, dir, text)[1]
+      
+    def __del__(self):
+        self.shutdown()
+       
+    def shutdown(self):
+        from os import remove
+        
+        remove(self.name)
+
 
 class VerboseStringIO(StringIO):

vcpx/cvs.py

@@ -12 +12 @@
 __docformat__ = 'reStructuredText'
 
-from shwrap import SystemCommand
+from shwrap import SystemCommand, ReopenableNamedTemporaryFile
 from cvsps import CvspsWorkingDir
 from source import GetUpstreamChangesetsFailure
@@ -36 +36 @@
     return cmp(r1, r2)
 
-
-import 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 CvsLog(SystemCommand):
@@ -62 +41 @@
        
     def __call__(self, output=None, dry_run=False, **kwargs):
-        from tempfile import mktemp
-        
         since = kwargs.get('since')
         if since:
@@ -75 +52 @@
         
         self.rontf = ReopenableNamedTemporaryFile('cvs', 'tailor')
-        logfn = kwargs['tempfilename'] = rontf.name
+        logfn = kwargs['tempfilename'] = self.rontf.name
         
         SystemCommand.__call__(self, output=False, dry_run=dry_run, **kwargs)