From: Amaury Forgeot d'Arc <amauryfa@gmail.com>
Date: Fri, 5 Dec 2008 01:42:09 +0000 (+0000)
Subject: Merged revisions 67541 via svnmerge from
X-Git-Tag: v3.0.1~267
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=199c30e802ec05406435e49cdb00ab4416901aaf;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 67541 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r67541 | amaury.forgeotdarc | 2008-12-05 02:40:43 +0100 (ven., 05 déc. 2008) | 5 lines

  #4542: On Windows, binascii.crc32 still accepted str as binary input.
  This fixes test_binascii.

  Will backport to 3.0
........
---

diff --git a/Misc/NEWS b/Misc/NEWS
index e2a72394ffa8..be55e58052e2 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -15,6 +15,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 52bd6dcc11eb..51101b412a5b 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;