From 159ae41da68ff1f1d85ed66fa6410bd9ba62ed5b Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 12 May 2013 18:16:06 -0500
Subject: [PATCH] when an argument is a cell, set the local copy to NULL (see
 #17927)

---
 Lib/test/test_super.py | 13 +++++++++++++
 Objects/typeobject.c   | 14 +++++++++++---
 Python/ceval.c         | 12 ++++--------
 3 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/Lib/test/test_super.py b/Lib/test/test_super.py
index f6469cf2639..1e272ee2cf5 100644
--- a/Lib/test/test_super.py
+++ b/Lib/test/test_super.py
@@ -130,6 +130,19 @@ class TestSuper(unittest.TestCase):
                 super()
         self.assertRaises(RuntimeError, X().f)
 
+    def test_cell_as_self(self):
+        class X:
+            def meth(self):
+                super()
+
+        def f():
+            k = X()
+            def g():
+                return k
+            return g
+        c = f().__closure__[0]
+        self.assertRaises(TypeError, X.meth, c)
+
 
 def test_main():
     support.run_unittest(TestSuper)
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index e418a3a9574..a3516671a74 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -6510,9 +6510,17 @@ super_init(PyObject *self, PyObject *args, PyObject *kwds)
             return -1;
         }
         obj = f->f_localsplus[0];
-        if (obj != NULL && PyCell_Check(obj)) {
-            /* It might be a cell.  See cell var initialization in ceval.c. */
-            obj = PyCell_GET(obj);
+        if (obj == NULL && co->co_cell2arg) {
+            /* The first argument might be a cell. */
+            n = PyTuple_GET_SIZE(co->co_cellvars);
+            for (i = 0; i < n; i++) {
+                if (co->co_cell2arg[i] == 0) {
+                    PyObject *cell = f->f_localsplus[co->co_nlocals + i];
+                    assert(PyCell_Check(cell));
+                    obj = PyCell_GET(cell);
+                    break;
+                }
+            }
         }
         if (obj == NULL) {
             PyErr_SetString(PyExc_RuntimeError,
diff --git a/Python/ceval.c b/Python/ceval.c
index d6dba56b3c3..e211e4fcaa3 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -3521,18 +3521,14 @@ PyEval_EvalCodeEx(PyObject *_co, PyObject *globals, PyObject *locals,
         if (co->co_cell2arg != NULL &&
             (arg = co->co_cell2arg[i]) != CO_CELL_NOT_AN_ARG) {
             c = PyCell_New(GETLOCAL(arg));
-            if (c == NULL)
-                goto fail;
-            /* Reference the cell from the argument slot, for super().
-               See typeobject.c. */
-            Py_INCREF(c);
-            SETLOCAL(arg, c);
+            /* Clear the local copy. */
+            SETLOCAL(arg, NULL);
         }
         else {
             c = PyCell_New(NULL);
-            if (c == NULL)
-                goto fail;
         }
+        if (c == NULL)
+            goto fail;
         SETLOCAL(co->co_nlocals + i, c);
     }
     for (i = 0; i < PyTuple_GET_SIZE(co->co_freevars); ++i) {