Changeset 4986

Timestamp:

Feb 5, 2008, 1:31:57 PM (17 years ago)

Author:

steve

Message:

Fixed problem with zlib.crc32 and binascii.crc32 on 64 bit machine,
they gave different answers.

Location:

anuga_core/source/anuga/utilities

Files:

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

anuga_core/source/anuga/utilities/system_tools.py

@@ -180 +180 @@
     """
 
-    #from zlib import crc32
-    from binascii import crc32 #(works as well)
+    from zlib import crc32
+    # On bogong binascii.crc32 gave a different answer to
+    # zlib.crc32
+    #from binascii import crc32 #(works as well on 32 bit machines)
     
     fid = open(filename)
     crcval = crc32(fid.read(max_length))
+
     fid.close()
     return crcval

anuga_core/source/anuga/utilities/test_system_tools.py

@@ -42 +42 @@
         fid.write(string)
         fid.flush()
-
+        fid.close()
 
         ref_crc = zlib.crc32(string)
 
+        checksum = compute_checksum(tmp_name)
 
-
-        checksum = compute_checksum(tmp_name)
 
         assert checksum == ref_crc
 
-        fid.close()
         os.remove(tmp_name)
         
-