[Pkg-bazaar-commits] ./bzr/unstable r565: - more invariant checks in AtomicFile

[Martin Pool]

------------------------------------------------------------
revno: 565
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Fri 2005-05-27 02:09:45 +1000
message:
  - more invariant checks in AtomicFile
modified:
  bzrlib/atomicfile.py
-------------- next part --------------
=== modified file 'bzrlib/atomicfile.py'
--- a/bzrlib/atomicfile.py	2005-05-26 16:02:02 +0000
+++ b/bzrlib/atomicfile.py	2005-05-26 16:09:45 +0000
@@ -61,8 +61,10 @@
         if self.closed:
             raise Exception('%r is already closed' % self)
 
+        self.closed = True
         self.f.close()
-        self.closed = True
+        self.f = None
+        
         if sys.platform == 'win32':
             # windows cannot rename over an existing file
             try:
@@ -71,6 +73,7 @@
                 import errno
                 if e.errno != errno.ENOENT:
                     raise
+                
         os.rename(self.tmpfilename, self.realfilename)
 
 
@@ -81,8 +84,9 @@
         if self.closed:
             raise Exception('%r is already closed' % self)
 
+        self.closed = True
         self.f.close()
-        self.closed = True
+        self.f = None
         os.remove(self.tmpfilename)