From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sat, 16 Jan 2010 18:15:15 +0000 (+0000)
Subject: Remove duplicated line when merging (it was even valid C!).
X-Git-Tag: v3.2a1~1834
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9f96ffc8b9e647d0a192b20013d4b8fcff32f586;p=thirdparty%2FPython%2Fcpython.git

Remove duplicated line when merging (it was even valid C!).
Thanks Florent for noticing.
---

diff --git a/Modules/binascii.c b/Modules/binascii.c
index 289225b03e5c..38d22abcd1a0 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;