commit 5d7428b8ce0ffc79b24b05df2b3d2865db037902
author Martin v. Löwis <martin@v.loewis.de> Sat Jul 21 18:47:48 2007 +0000
committer Martin v. Löwis <martin@v.loewis.de> Sat Jul 21 18:47:48 2007 +0000
tree c673d91d8fe112d194cb9bbf45006b8b35838965
parent 9f2e346911988cda95fec7c901e8d10d34fa9563

Fix merge breakage.

Objects/stringobject.c

diff --git a/Objects/stringobject.c b/Objects/stringobject.c
index 6156b2f..68dfd35 100644
--- a/Objects/stringobject.c
+++ b/Objects/stringobject.c
@@ -835,7 +835,7 @@
 	static const char *hexdigits = "0123456789abcdef";
 	register PyStringObject* op = (PyStringObject*) obj;
 	Py_ssize_t length = PyString_GET_SIZE(op);
-	size_t newsize = 3 + 4 * op->ob_size;
+	size_t newsize = 3 + 4 * Py_Size(op);
 	PyObject *v;
 	if (newsize > PY_SSIZE_T_MAX || newsize / 4 != Py_Size(op)) {
 		PyErr_SetString(PyExc_OverflowError,