Create self.kwargs only if accessed

Rémi Lapeyre · Rémi Lapeyre · commit 9986e8622bc2 · 2019-01-17T00:35:40.000+01:00
diff --git a/Objects/exceptions.c b/Objects/exceptions.c
@@ -56,16 +56,8 @@ BaseException_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
         }
     }
 
-    if (kwds) {
-        self->kwargs = kwds;
-        Py_INCREF(kwds);
-    } else {
-        self->kwargs = PyDict_New();
-        if (!self->kwargs) {
-            Py_DECREF(self);
-            return NULL;
-        }
-    }
+    self->kwargs = kwds;
+    Py_XINCREF(kwds);
 
     return (PyObject *)self;
 }
@@ -345,9 +337,9 @@ BaseException_set_args(PyBaseExceptionObject *self, PyObject *val, void *Py_UNUS
 static PyObject *
 BaseException_get_kwargs(PyBaseExceptionObject *self, void *Py_UNUSED(ignored)) {
     if (self->kwargs == NULL) {
-        Py_RETURN_NONE;
+        self->kwargs = PyDict_New();
     }
-    Py_INCREF(self->kwargs);
+    Py_XINCREF(self->kwargs);
     return self->kwargs;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -56,16 +56,8 @@ BaseException_new(PyTypeObject type, PyObject args, PyObject *kwds)`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`
`59`		`- if (kwds) {`
`60`		`- self->kwargs = kwds;`
`61`		`- Py_INCREF(kwds);`
`62`		`- } else {`
`63`		`- self->kwargs = PyDict_New();`
`64`		`- if (!self->kwargs) {`
`65`		`- Py_DECREF(self);`
`66`		`- return NULL;`
`67`		`- }`
`68`		`- }`
	`59`	`+ self->kwargs = kwds;`
	`60`	`+ Py_XINCREF(kwds);`
`69`	`61`
`70`	`62`	`return (PyObject *)self;`
`71`	`63`	`}`
`@@ -345,9 +337,9 @@ BaseException_set_args(PyBaseExceptionObject self, PyObject val, void *Py_UNUS`
`345`	`337`	`static PyObject *`
`346`	`338`	`BaseException_get_kwargs(PyBaseExceptionObject self, void Py_UNUSED(ignored)) {`
`347`	`339`	`if (self->kwargs == NULL) {`
`348`		`- Py_RETURN_NONE;`
	`340`	`+ self->kwargs = PyDict_New();`
`349`	`341`	`}`
`350`		`- Py_INCREF(self->kwargs);`
	`342`	`+ Py_XINCREF(self->kwargs);`
`351`	`343`	`return self->kwargs;`
`352`	`344`	`}`
`353`	`345`