initialize __dict__ if needed

diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py
index 22277798f6dd29208784bb67de42cd29567ad5c8..7b9a5230a163592017479ad7d6e5566f776c4cfd 100644 (file)
--- a/Lib/test/test_descr.py
+++ b/Lib/test/test_descr.py
@@ -1444,6 +1444,7 @@ order (MRO) for bases """
             self.fail("classmethod shouldn't accept keyword args")
 
         cm = classmethod(f)
+        self.assertEqual(cm.__dict__, {})
         cm.x = 42
         self.assertEqual(cm.x, 42)
         self.assertEqual(cm.__dict__, {"x" : 42})
@@ -1482,6 +1483,7 @@ order (MRO) for bases """
         self.assertEqual(d.foo(1), (d, 1))
         self.assertEqual(D.foo(d, 1), (d, 1))
         sm = staticmethod(None)
+        self.assertEqual(sm.__dict__, {})
         sm.x = 42
         self.assertEqual(sm.x, 42)
         self.assertEqual(sm.__dict__, {"x" : 42})

diff --git a/Objects/funcobject.c b/Objects/funcobject.c
index 089356b40fbb7bf4f4a6c14eb616a07a4bfc3f85..6dd91b8ca4d1f3469fdee71ae354d97ce1a9cf26 100644 (file)
--- a/Objects/funcobject.c
+++ b/Objects/funcobject.c
@@ -832,10 +832,13 @@ cm_get___isabstractmethod__(classmethod *cm, void *closure)
 }
 
 static PyObject *
-cm_get___dict__(classmethod *cm, void *closure)
+cm_get___dict__(PyObject *cm, void *closure)
 {
-    Py_INCREF(cm->cm_dict);
-    return cm->cm_dict;
+    PyObject **dictptr = _PyObject_GetDictPtr(cm);
+    if (*dictptr == NULL)
+        *dictptr = PyDict_New();
+    Py_XINCREF(*dictptr);
+    return *dictptr;
 }
 
 static PyGetSetDef cm_getsetlist[] = {
@@ -1018,10 +1021,13 @@ sm_get___isabstractmethod__(staticmethod *sm, void *closure)
 }
 
 static PyObject *
-sm_get___dict__(staticmethod *sm, void *closure)
+sm_get___dict__(PyObject *sm, void *closure)
 {
-    Py_INCREF(sm->sm_dict);
-    return sm->sm_dict;
+    PyObject **dictptr = _PyObject_GetDictPtr(sm);
+    if (*dictptr == NULL)
+        *dictptr = PyDict_New();
+    Py_XINCREF(*dictptr);
+    return *dictptr;
 }
 
 static PyGetSetDef sm_getsetlist[] = {