[Python-checkins] r51034 - python/trunk/Lib/tarfile.py

[tim.peters]

Author: tim.peters
Date: Wed Aug  2 07:20:08 2006
New Revision: 51034

Modified:
   python/trunk/Lib/tarfile.py
Log:
_Stream.close():  Try to kill struct.pack() warnings when
writing the crc to file on the "PPC64 Debian trunk" buildbot
when running test_tarfile.

This is again a case where the native zlib crc is an unsigned
32-bit int, but the Python wrapper implicitly casts it to
signed C long, so that "the sign bit looks different" on
different platforms.


Modified: python/trunk/Lib/tarfile.py
==============================================================================
--- python/trunk/Lib/tarfile.py	(original)
+++ python/trunk/Lib/tarfile.py	Wed Aug  2 07:20:08 2006
@@ -417,7 +417,13 @@
             self.fileobj.write(self.buf)
             self.buf = ""
             if self.comptype == "gz":
-                self.fileobj.write(struct.pack("<l", self.crc))
+                # The native zlib crc is an unsigned 32-bit integer, but
+                # the Python wrapper implicitly casts that to a signed C
+                # long.  So, on a 32-bit box self.crc may "look negative",
+                # while the same crc on a 64-bit box may "look positive".
+                # To avoid irksome warnings from the `struct` module, force
+                # it to look positive on all boxes.
+                self.fileobj.write(struct.pack("<L", self.crc & 0xffffffffL))
                 self.fileobj.write(struct.pack("<L", self.pos & 0xffffFFFFL))
 
         if not self._extfileobj: