[Python-checkins] cpython (merge 3.4 -> default): merge 3.4

[benjamin.peterson]

https://hg.python.org/cpython/rev/b1442a6832ab
changeset:   92642:b1442a6832ab
parent:      92639:0ddc5fc5f395
parent:      92641:158127da99ac
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon Sep 29 19:12:44 2014 -0400
summary:
  merge 3.4

files:
  Objects/bytesobject.c |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
--- a/Objects/bytesobject.c
+++ b/Objects/bytesobject.c
@@ -620,7 +620,7 @@
 {
     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;
 

-- 
Repository URL: https://hg.python.org/cpython