Put some consistency to python object creation

- all type object creation goes through foo_Wrap() which handle OOM
  and all type specific initialization

1 files changed, 4 insertions, 12 deletions

diff --git a/python/rpmps-py.c b/python/rpmps-py.c
index 408234ce2..652d83b6c 100644
--- a/python/rpmps-py.c
+++ b/python/rpmps-py.c
@@ -165,15 +165,8 @@ fprintf(stderr, "%p -- ps %p\n", s, s->ps);
  */
 static PyObject * rpmps_new(PyTypeObject * subtype, PyObject *args, PyObject *kwds)
 {
-    rpmpsObject * s = (void *) PyObject_New(rpmpsObject, subtype);
-
-    s->ps = rpmpsCreate();
-    s->psi = NULL;
-
-if (_rpmps_debug)
-fprintf(stderr, "%p ++ ps %p\n", s, s->ps);
-
-    return (PyObject *)s;
+    rpmps ps = rpmpsCreate();
+    return rpmps_Wrap(ps);
 }
 
 /**
@@ -236,10 +229,9 @@ rpmps psFromPs(rpmpsObject * s)
 PyObject * rpmps_Wrap(rpmps ps)
 {
     rpmpsObject * s = PyObject_New(rpmpsObject, &rpmps_Type);
+    if (s == NULL) return PyErr_NoMemory();
 
-    if (s == NULL)
-	return NULL;
-    s->ps = ps;
+    s->ps = ps; /* XXX refcounts? */
     s->psi = NULL;
     return (PyObject *) s;
 }