From: Florent Xicluna <florent.xicluna@gmail.com>
Date: Fri, 28 Oct 2011 13:06:13 +0000 (+0200)
Subject: Merge 3.2 (linked to issue #1294232)
X-Git-Tag: v3.3.0a1~1043
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=908ae24b066b04651701d5ee5e5d80cfb5d6b018;p=thirdparty%2FPython%2Fcpython.git

Merge 3.2 (linked to issue #1294232)
---

908ae24b066b04651701d5ee5e5d80cfb5d6b018
diff --cc Python/bltinmodule.c
index fd242b7408e6,d05232c34af5..0c14d7e32616
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@@ -40,9 -37,8 +40,9 @@@ builtin___build_class__(PyObject *self
  {
      PyObject *func, *name, *bases, *mkw, *meta, *winner, *prep, *ns, *cell;
      PyObject *cls = NULL;
-     Py_ssize_t nargs, nbases;
+     Py_ssize_t nargs;
      int isclass;
 +    _Py_IDENTIFIER(__prepare__);
  
      assert(args != NULL);
      if (!PyTuple_Check(args)) {