summaryrefslogtreecommitdiff
path: root/Objects
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-09-29 19:12:44 -0400
committerBenjamin Peterson <benjamin@python.org>2014-09-29 19:12:44 -0400
commitcdfb7691dd3aa4b1a868638a5654c4098b77d0d7 (patch)
tree01072a2cf0d18f65b0dd16c3c5d7a4edebe8cf09 /Objects
parent36a24f3f43c5eab4f02bbff5d7c47accfb509f65 (diff)
parentc2cfa8ddd8dbad8e09b3f3cec56b0727c9370af1 (diff)
downloadcpython-git-cdfb7691dd3aa4b1a868638a5654c4098b77d0d7.tar.gz
merge 3.4
Diffstat (limited to 'Objects')
-rw-r--r--Objects/bytesobject.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
index caea124eb7..87c0a25608 100644
--- 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;