From: Benjamin Peterson <benjamin@python.org>
Date: Mon, 29 Sep 2014 23:12:37 +0000 (-0400)
Subject: merge 3.3
X-Git-Tag: v3.4.3rc1~599
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c2cfa8ddd8dbad8e09b3f3cec56b0727c9370af1;p=thirdparty%2FPython%2Fcpython.git

merge 3.3
---

c2cfa8ddd8dbad8e09b3f3cec56b0727c9370af1
diff --cc Objects/bytesobject.c
index 6eb61e352752,32c5d71ecd1c..4a8561cf2f39
--- a/Objects/bytesobject.c
+++ b/Objects/bytesobject.c
@@@ -592,9 -582,9 +592,9 @@@ PyBytes_AsStringAndSize(PyObject *obj
  PyObject *
  PyBytes_Repr(PyObject *obj, int smartquotes)
  {
 -    register PyBytesObject* op = (PyBytesObject*) obj;
 +    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;