util.c (mkexc): Populate dictionary before constructing exception class.

[pyke] / util.c

diff --git a/util.c b/util.c
index 9332c8b327de4d226bad686ec03a461336d53fe6..29f7d123269e934db11843d5db75498a4275ac1b 100644 (file)
--- a/util.c
+++ b/util.c
@@ -324,13 +324,7 @@ PyObject *mkexc(PyObject *mod, PyObject *base,
   PyObject *func = 0;
   PyObject *meth = 0;
 
   PyObject *func = 0;
   PyObject *meth = 0;
 

-  if ((nameobj = PyString_FromFormat("%s.%s",
-                                    PyModule_GetName(mod),
-                                    name)) == 0 ||
-      (dict = PyDict_New()) == 0 ||
-      (exc = PyErr_NewException(PyString_AS_STRING(nameobj),
-                               base, dict)) == 0)
-    goto fail;
+  if ((dict = PyDict_New()) == 0) goto fail;

 
   if (mm) {
     while (mm->ml_name) {
 
   if (mm) {
     while (mm->ml_name) {


@@ -344,6 +338,13 @@ PyObject *mkexc(PyObject *mod, PyObject *base,
     }
   }
 
     }
   }
 

+  if ((nameobj = PyString_FromFormat("%s.%s",
+                                    PyModule_GetName(mod),
+                                    name)) == 0 ||
+      (exc = PyErr_NewException(PyString_AS_STRING(nameobj),
+                               base, dict)) == 0)
+    goto fail;
+

 done:
   Py_XDECREF(nameobj);
   Py_XDECREF(dict);
 done:
   Py_XDECREF(nameobj);
   Py_XDECREF(dict);