merge 3.4

benjaminp · benjaminp · commit 88822a9dbdac · 2014-09-29T19:12:44.000-04:00
diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
@@ -620,7 +620,7 @@ PyBytes_Repr(PyObject *obj, int smartquotes)
 {
     PyBytesObject* op = (PyBytesObject*) obj;
     Py_ssize_t i, length = Py_SIZE(op);
-    size_t newsize, squotes, dquotes;
+    Py_ssize_t newsize, squotes, dquotes;
     PyObject *v;
     unsigned char quote, *s, *p;
 

Original file line number	Diff line number	Diff line change
`@@ -620,7 +620,7 @@ PyBytes_Repr(PyObject *obj, int smartquotes)`
`620`	`620`	`{`
`621`	`621`	`PyBytesObject* op = (PyBytesObject*) obj;`
`622`	`622`	`Py_ssize_t i, length = Py_SIZE(op);`
`623`		`- size_t newsize, squotes, dquotes;`
	`623`	`+ Py_ssize_t newsize, squotes, dquotes;`
`624`	`624`	`PyObject *v;`
`625`	`625`	`unsigned char quote, s, p;`
`626`	`626`