merge 3.3

diff --cc Objects/stringlib/transmogrify.h
index dd00976eacaa49c08d198cf73bc083b8898ad90c,cbd7144b0ef92af05084fd1db2ea5a3587764d8a..cae6ea113a1dbea47272602d70bd28263290d3fd
--- 1/Objects/stringlib/transmogrify.h
--- 2/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 */