diff options
| author | Christian Heimes <christian@cheimes.de> | 2008-03-19 22:42:51 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2008-03-19 22:42:51 (GMT) |
| commit | 453e08c3bfa334bd8e12f521e4f768abdd9997a4 (patch) | |
| tree | 76e8f817485290f6cfcd4d0740c7848b242ec579 | |
| parent | d5e2b6f3bcef9fea744bef331ad7278052223f11 (diff) | |
| download | cpython-453e08c3bfa334bd8e12f521e4f768abdd9997a4.zip cpython-453e08c3bfa334bd8e12f521e4f768abdd9997a4.tar.gz cpython-453e08c3bfa334bd8e12f521e4f768abdd9997a4.tar.bz2 | |
Create a signed CRC32 hash. I'm not absolutely sure it's correct. At least it fixes the unit tests and doesn't create a different hash than Python 2.x
| -rw-r--r-- | Lib/test/test_zlib.py | 2 | ||||
| -rw-r--r-- | Modules/zlibmodule.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/test_zlib.py b/Lib/test/test_zlib.py index d2fd504..9cd5434 100644 --- a/Lib/test/test_zlib.py +++ b/Lib/test/test_zlib.py @@ -42,7 +42,7 @@ class ChecksumTestCase(unittest.TestCase): def test_crc32_adler32_unsigned(self): foo = 'abcdefghijklmnop' # explicitly test signed behavior - self.assertEqual(zlib.crc32(foo), 2486878355) + self.assertEqual(zlib.crc32(foo), -1808088941) self.assertEqual(zlib.crc32('spam'), 1138425661) self.assertEqual(zlib.adler32(foo+foo), 3573550353) self.assertEqual(zlib.adler32('spam'), 72286642) diff --git a/Modules/zlibmodule.c b/Modules/zlibmodule.c index a978370..551fd3e 100644 --- a/Modules/zlibmodule.c +++ b/Modules/zlibmodule.c @@ -940,7 +940,7 @@ PyZlib_crc32(PyObject *self, PyObject *args) if (!PyArg_ParseTuple(args, "s#|k:crc32", &buf, &len, &crc32val)) return NULL; crc32val = crc32(crc32val, buf, len); - return PyLong_FromUnsignedLong(crc32val & 0xffffffff); + return PyLong_FromLong(crc32val & 0xffffffff); } |