From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 30 Mar 2014 23:52:39 +0000 (-0400)
Subject: merge 3.3
X-Git-Tag: v3.4.1rc1~153
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d455ce4fd4078f1561ec0959dccd5b6561e4d3f6;p=python

merge 3.3
---

d455ce4fd4078f1561ec0959dccd5b6561e4d3f6
diff --cc Objects/stringlib/transmogrify.h
index dd00976eac,cbd7144b0e..cae6ea113a
--- a/Objects/stringlib/transmogrify.h
+++ b/Objects/stringlib/transmogrify.h
@@@ -15,13 -15,11 +15,13 @@@ stringlib_expandtabs(PyObject *self, Py
  {
      const char *e, *p;
      char *q;
-     size_t i, j;
+     Py_ssize_t i, j;
      PyObject *u;
 +    static char *kwlist[] = {"tabsize", 0};
      int tabsize = 8;
  
 -    if (!PyArg_ParseTuple(args, "|i:expandtabs", &tabsize))
 +    if (!PyArg_ParseTupleAndKeywords(args, kwds, "|i:expandtabs",
 +                                     kwlist, &tabsize))
          return NULL;
  
      /* First pass: determine size of output string */