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

[benjamin.peterson]

https://hg.python.org/cpython/rev/158127da99ac
changeset:   92641:158127da99ac
branch:      3.4
parent:      92638:ed31cdf11ac2
parent:      92640:226740b14f1c
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon Sep 29 19:12:37 2014 -0400
summary:
  merge 3.3

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
@@ -594,7 +594,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