- add rpmds/rpmfi/rpmts methods to bindings.

CVS patchset: 5447
CVS date: 2002/05/23 21:06:42

5 files changed, 8 insertions, 12 deletions

diff --git a/python/rpmds-py.c b/python/rpmds-py.c
index c695b1d43..58978bb77 100644
--- a/python/rpmds-py.c
+++ b/python/rpmds-py.c
@@ -265,7 +265,7 @@ rpmds dsFromDs(rpmdsObject * s)
 }
 
 rpmdsObject *
-rpmds_New(rpmds ds)
+rpmds_Wrap(rpmds ds)
 {
     rpmdsObject *s = PyObject_NEW(rpmdsObject, &rpmds_Type);
     if (s == NULL)
@@ -284,7 +284,7 @@ rpmds_Single(PyObject * s, PyObject * args)
 
     if (!PyArg_ParseTuple(args, "is|si", &tagN, &N, &EVR, &Flags))
 	return NULL;
-    return rpmds_New( rpmdsSingle(tagN, N, EVR, Flags) );
+    return rpmds_Wrap( rpmdsSingle(tagN, N, EVR, Flags) );
 }
 
 rpmdsObject *
@@ -296,7 +296,7 @@ hdr_dsFromHeader(PyObject * s, PyObject * args)
 
     if (!PyArg_ParseTuple(args, "O!|i", &hdr_Type, &ho, &tagN))
 	return NULL;
-    return rpmds_New( rpmdsNew(hdrGetHeader(ho), tagN, scareMem) );
+    return rpmds_Wrap( rpmdsNew(hdrGetHeader(ho), tagN, scareMem) );
 }
 
 rpmdsObject *
@@ -308,5 +308,5 @@ hdr_dsOfHeader(PyObject * s, PyObject * args)
 
     if (!PyArg_ParseTuple(args, "O!", &hdr_Type, &ho))
 	return NULL;
-    return rpmds_New( rpmdsThis(hdrGetHeader(ho), tagN, Flags) );
+    return rpmds_Wrap( rpmdsThis(hdrGetHeader(ho), tagN, Flags) );
 }
diff --git a/python/rpmds-py.h b/python/rpmds-py.h
index e73009087..88a2b34d4 100644
--- a/python/rpmds-py.h
+++ b/python/rpmds-py.h
@@ -14,7 +14,7 @@ extern PyTypeObject rpmds_Type;
 
 rpmds dsFromDs(rpmdsObject * ds);
 
-rpmdsObject * rpmds_New(rpmds ds);
+rpmdsObject * rpmds_Wrap(rpmds ds);
 
 rpmdsObject * rpmds_Single(PyObject * s, PyObject * args);
 
diff --git a/python/rpmfi-py.c b/python/rpmfi-py.c
index d80a4957e..810fd1713 100644
--- a/python/rpmfi-py.c
+++ b/python/rpmfi-py.c
@@ -354,7 +354,7 @@ rpmfi fiFromFi(rpmfiObject * s)
 }
 
 rpmfiObject *
-rpmfi_New(rpmfi fi)
+rpmfi_Wrap(rpmfi fi)
 {
     rpmfiObject *s = PyObject_NEW(rpmfiObject, &rpmfi_Type);
     if (s == NULL)
@@ -370,5 +370,5 @@ hdr_fiFromHeader(PyObject * s, PyObject * args)
 
     if (!PyArg_ParseTuple(args, "O!", &hdr_Type, &ho))
 	return NULL;
-    return rpmfi_New( rpmfiNew(NULL, NULL, hdrGetHeader(ho), RPMTAG_BASENAMES, 0) );
+    return rpmfi_Wrap( rpmfiNew(NULL, NULL, hdrGetHeader(ho), RPMTAG_BASENAMES, 0) );
 }
diff --git a/python/rpmfi-py.h b/python/rpmfi-py.h
index 5171e69fb..60dca8380 100644
--- a/python/rpmfi-py.h
+++ b/python/rpmfi-py.h
@@ -14,7 +14,7 @@ extern PyTypeObject rpmfi_Type;
 
 rpmfi fiFromFi(rpmfiObject * fi);
 
-rpmfiObject * rpmfi_New(rpmfi fi);
+rpmfiObject * rpmfi_Wrap(rpmfi fi);
 
 rpmfiObject * hdr_fiFromHeader(PyObject * s, PyObject * args);
 
diff --git a/python/rpmts-py.h b/python/rpmts-py.h
index f5640104f..59f1c6650 100644
--- a/python/rpmts-py.h
+++ b/python/rpmts-py.h
@@ -21,10 +21,6 @@ enum {
    RPMDEP_SENSE_CONFLICTS		/*!< conflict was found. */
 };
 
-rpmts tsFromTs(rpmtsObject * ts);
-
-rpmtsObject * rpmts_New(rpmts ts);
-
 rpmtsObject * rpmts_Create(PyObject * s, PyObject * args);
 
 #endif