summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-01-16 18:15:15 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-01-16 18:15:15 (GMT)
commit9f96ffc8b9e647d0a192b20013d4b8fcff32f586 (patch)
tree9cf012181804a2827229b3257143d3f765c84b2e /Modules
parent45b6365974b6611c3dc1c2e48c55d36ca0e500d9 (diff)
downloadcpython-9f96ffc8b9e647d0a192b20013d4b8fcff32f586.zip
cpython-9f96ffc8b9e647d0a192b20013d4b8fcff32f586.tar.gz
cpython-9f96ffc8b9e647d0a192b20013d4b8fcff32f586.tar.bz2
Remove duplicated line when merging (it was even valid C!).
Thanks Florent for noticing.
Diffstat (limited to 'Modules')
-rw-r--r--Modules/binascii.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/Modules/binascii.c b/Modules/binascii.c
index 289225b..38d22ab 100644
--- a/Modules/binascii.c
+++ b/Modules/binascii.c
@@ -561,7 +561,6 @@ binascii_a2b_hqx(PyObject *self, PyObject *args)
/* Allocate a string that is too big (fixed later)
Add two to the initial length to prevent interning which
would preclude subsequent resizing. */
- if ( (rv=PyBytes_FromStringAndSize(NULL, len+2)) == NULL )
if ( (rv=PyBytes_FromStringAndSize(NULL, len+2)) == NULL ) {
PyBuffer_Release(&pascii);
return NULL;