summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmaury Forgeot d'Arc <amauryfa@gmail.com>2008-12-05 01:40:43 (GMT)
committerAmaury Forgeot d'Arc <amauryfa@gmail.com>2008-12-05 01:40:43 (GMT)
commitbc9d4749f2f2af4c81c6c088a32ca5672d58a571 (patch)
tree33d7a8dfcc99980f48642801b5c151c47166de16
parentbc2ce57203e1f355004ec95953eae9dec780ef9a (diff)
downloadcpython-bc9d4749f2f2af4c81c6c088a32ca5672d58a571.zip
cpython-bc9d4749f2f2af4c81c6c088a32ca5672d58a571.tar.gz
cpython-bc9d4749f2f2af4c81c6c088a32ca5672d58a571.tar.bz2
#4542: On Windows, binascii.crc32 still accepted str as binary input.
This fixes test_binascii. Will backport to 3.0
-rw-r--r--Misc/NEWS3
-rw-r--r--Modules/binascii.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 15e3401..87af173 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -16,6 +16,9 @@ Core and Builtins
Library
-------
+- Issue #4542: On Windows, binascii.crc32 still accepted str as binary input;
+ the corresponding tests now pass.
+
- Issue #4537: webbrowser.UnixBrowser would fail to open the browser because
it was calling the wrong open() function.
diff --git a/Modules/binascii.c b/Modules/binascii.c
index 52bd6dc..51101b4 100644
--- a/Modules/binascii.c
+++ b/Modules/binascii.c
@@ -1019,7 +1019,7 @@ binascii_crc32(PyObject *self, PyObject *args)
Py_ssize_t len;
unsigned int result;
- if ( !PyArg_ParseTuple(args, "s*|I:crc32", &pbin, &crc) )
+ if ( !PyArg_ParseTuple(args, "y*|I:crc32", &pbin, &crc) )
return NULL;
bin_data = pbin.buf;
len = pbin.len;