Revert "Stylistic changes and refcount fixes in PythonQtImporter_load_module"

This reverts commit 0901f7b.

Author: usiems

src/PythonQt.cpp

@@ -71,9 +71,8 @@ void PythonQt_init_QtCoreBuiltin(PyObject*);
 static inline int PyModule_AddObject_DECREF(PyObject *module, const char *name, PyObject *value)
 {
   int ret = PyModule_AddObject(module, name, value);
-  if (ret < 0) {
+  if (ret < 0)
     Py_XDECREF(value);
-  }
   return ret;
 }
 
@@ -2147,9 +2146,8 @@ const QMetaObject* PythonQtPrivate::buildDynamicMetaObject(PythonQtClassWrapper*
   PyObject* value = NULL;
   PyObject* key = NULL;
   static PyObject* qtSlots = NULL;
-  if (!qtSlots) {
-    qtSlots = PyString_FromString("_qtSlots");
-  }
+  if (!qtSlots)
+      qtSlots = PyString_FromString("_qtSlots");
 
   bool needsMetaObject = false;
   // Iterate over all members and check if they affect the QMetaObject:

src/PythonQtImporter.cpp

@@ -224,9 +224,9 @@ PythonQtImporter_load_module(PyObject *obj, PyObject *args)
   PyObject *code = NULL, *mod = NULL, *dict = NULL;
   char *fullname;
 
-  if (!PyArg_ParseTuple(args, "s:PythonQtImporter.load_module", &fullname)) {
+  if (!PyArg_ParseTuple(args, "s:PythonQtImporter.load_module",
+            &fullname))
     return NULL;
-  }
 
   PythonQtImport::ModuleInfo info = PythonQtImport::getModuleInfo(self, fullname);
   if (info.type == PythonQtImport::MI_NOT_FOUND) {
@@ -250,6 +250,7 @@ PythonQtImporter_load_module(PyObject *obj, PyObject *args)
 
     if (PyDict_SetItemString(dict, "__loader__", (PyObject *)self) != 0) {
       Py_DECREF(code);
+      Py_DECREF(mod);
       return NULL;
     }
 
@@ -264,19 +265,22 @@ PythonQtImporter_load_module(PyObject *obj, PyObject *args)
                                      QStringToPythonConstCharPointer(subname));
       if (fullpath == NULL) {
         Py_DECREF(code);
+        Py_DECREF(mod);
         return NULL;
       }
 
       pkgpath = Py_BuildValue("[O]", fullpath);
       Py_DECREF(fullpath);
       if (pkgpath == NULL) {
         Py_DECREF(code);
+        Py_DECREF(mod);
         return NULL;
       }
       err = PyDict_SetItemString(dict, "__path__", pkgpath);
       Py_DECREF(pkgpath);
       if (err != 0) {
         Py_DECREF(code);
+        Py_DECREF(mod);
         return NULL;
       }
 
@@ -290,10 +294,12 @@ PythonQtImporter_load_module(PyObject *obj, PyObject *args)
       Py_XDECREF(fullnameObj);
       if (err != 0) {
         Py_DECREF(code);
+        Py_DECREF(mod);
         return NULL;
       }
 #endif
     }
+    Py_DECREF(mod);
 
 #ifdef PY3K
     PyObject* fullnameObj = PyUnicode_FromString(fullname);