Changeset 4977

Timestamp:

Jan 28, 2008, 10:46:34 AM (16 years ago)

Author:

steve

Message:

Problem with NamedTemporaryFile? in windows. Sometimes gives error
if trying to open already openned file. Can't close it, as it is
automatically deleted on closure. So went back to manual method using mkstemp

Location:

anuga_core/source/anuga/utilities

Files:

• system_tools.py (modified) (1 diff)
• test_system_tools.py (modified) (4 diffs)

anuga_core/source/anuga/utilities/system_tools.py

@@ -185 +185 @@
     fid = open(filename)
     crcval = crc32(fid.read(max_length))
+    fid.close()
     return crcval

anuga_core/source/anuga/utilities/test_system_tools.py

@@ -34 +34 @@
 
         import zlib
-        from tempfile import NamedTemporaryFile, mktemp
+        from tempfile import mkstemp, mktemp
 
         # Generate a text file
-        fid = NamedTemporaryFile(mode='w',
-                                 suffix='.tmp',
-                                 dir='.')
+        tmp_fd , tmp_name = mkstemp(suffix='.tmp',dir='.')
+        fid = os.fdopen(tmp_fd,'w')
         string = 'My temp file with textual content. AAAABBBBCCCC1234'
         fid.write(string)
@@ -46 +45 @@
 
         ref_crc = zlib.crc32(string)
-        checksum = compute_checksum(fid.name)
+
+
+
+        checksum = compute_checksum(tmp_name)
 
         assert checksum == ref_crc
 
-        # Close and remove temporary file
         fid.close()
+        os.remove(tmp_name)
+        
 
 
 
         # Binary file
-        fid = NamedTemporaryFile(mode='w+b',
-                                 suffix='.tmp',
-                                 dir='.')
+        tmp_fd , tmp_name = mkstemp(suffix='.tmp',dir='.')
+        fid = os.fdopen(tmp_fd,'w+b')
+        
+
         string = 'My temp file with binary content. AAAABBBBCCCC1234'
         fid.write(string)
@@ -65 +69 @@
 
         ref_crc = zlib.crc32(string)
-        checksum = compute_checksum(fid.name)
+        checksum = compute_checksum(tmp_name)
 
         assert checksum == ref_crc
@@ -71 +75 @@
         # Close and remove temporary file
         fid.close()
-        
+        os.remove(tmp_name)        
         
         # Binary NetCDF File X 2 (use mktemp's name)