Changeset 3117 for trunk/lang

Timestamp:

Jul 26, 2012, 6:58:17 PM (12 years ago)

Author:

gah

Message:

 

File:

• trunk/lang/python/Rappture/PyRpLibrary.cc (modified) (29 diffs)

trunk/lang/python/Rappture/PyRpLibrary.cc

@@ -37 +37 @@
 static RpLibrary * RpLibraryObject_AsLibrary(PyObject *lib);
 static PyObject * RpLibraryObject_FromLibrary(RpLibrary *lib);
-static int boolAsInt(const char *inVal, int *outVal);
-static int boolIntFromPyObject (PyObject *inPyObj, const char *defaultVal,
-        const char *argName, int *boolVal);
+static int StringToBoolean(const char *inVal, int *resultPtr);
+static int PyObjectToBoolean(PyObject *objPtr, const char *defaultVal,
+        const char *argName, int *resultPtr);
 static int getArgCount(PyObject *args, PyObject *keywds, int *argc);
 
@@ -63 +63 @@
     }
     return TRUE;
+}
+
+
+/*
+ *  StringToBoolean --
+ *
+ *  represent a boolean string as an integer.
+ *
+ *  outVal set to 1 if the boolean value inVal could
+ *  be associated with any of the following strings:
+ *  "yes", "on", "true", "1".
+ *
+ *  outVal set to 0 if the boolean value inVal could
+ *  be associated with any of the following strings:
+ *  "no", "off", "false", "0".
+ *
+ *  returns a status integer to tell if the operation
+ *  was successful (0) of if there was an error (!0)
+ *
+ *  note: string comparisons are case insensitive.
+ */
+
+static int
+StringToBoolean(const char *string, int *resultPtr)
+{
+    char c;
+
+    if ((string == NULL) || (resultPtr == NULL) ) {
+        PyErr_Format(PyExc_TypeError,
+                     "incorrect use of StringToBoolean(inVal,outVal)");
+        return RP_ERROR;
+    }
+    c = tolower(string[0]);
+    if ((c == 'y') && (strcasecmp(string, "yes") == 0)) {
+        *resultPtr = TRUE;
+    } else if ((c == 'n') && (strcasecmp(string, "no") == 0)) {
+        *resultPtr = FALSE;
+    } else if ((c == 'o') && (strcasecmp(string, "on") == 0)) {
+        *resultPtr = TRUE;
+    } else if ((c == 'o') && (strcasecmp(string, "off") == 0)) {
+        *resultPtr = FALSE;
+    } else if ((c == 't') && (strcasecmp(string, "true") == 0)) {
+        *resultPtr = TRUE;
+    } else if ((c == 'f') && (strcasecmp(string, "false") == 0)) {
+        *resultPtr = FALSE;
+    } else if ((c == '1') && (strcasecmp(string, "1") == 0)) {
+        *resultPtr = TRUE;
+    } else if ((c == '0') && (strcasecmp(string, "0") == 0)) {
+        *resultPtr = FALSE;
+    } else {
+        PyErr_Format(PyExc_ValueError,
+            "unrecognized input: %s: should be one of: \'yes\',\'true\',\'on\',\'1\',1,True,\'no\',\'false\',\'off\',\'0\',0,False", string);
+        return RP_ERROR;
+    }
+    return RP_OK;
+}
+
+static int
+PyObjectToBoolean(PyObject *objPtr, const char *defValue, const char *argName, 
+                  int *resultPtr)
+{
+    int value;
+
+    value = FALSE;                      // Suppress compiler warning.
+    if ((defValue == NULL) || (argName == NULL) || (resultPtr == NULL)) {
+        // incorrect use of function
+        PyErr_Format(PyExc_ValueError,
+            "PyObjectToBoolean: defValue or argName or resultPtr is NULL");
+        return RP_ERROR;
+    }
+    if (objPtr == NULL) {
+        return StringToBoolean(defValue, resultPtr);
+    }
+    if (PyBool_Check(objPtr)) {
+        value = PyObject_IsTrue(objPtr);
+        if (value < 0) {
+             PyErr_Format(PyExc_ValueError, 
+                "PyObjectToBoolean: bad boolean object");
+            return RP_ERROR;
+        }
+    } else if (PyLong_Check(objPtr)) {
+        long l;
+
+        l = PyLong_AsLong(objPtr);
+        value = (l == 0) ? FALSE : TRUE;
+    } else if (PyInt_Check(objPtr)) {
+        long l;
+
+        l = PyInt_AsLong(objPtr);
+        value = (l == 0) ? FALSE : TRUE;
+    } else if (PyFloat_Check(objPtr)) {
+        double d;
+
+        d = PyFloat_AS_DOUBLE(objPtr);
+        value = (d == 0.0) ? FALSE : TRUE;
+    } else if (PyString_Check(objPtr)) {
+        const char *string;
+        
+        string = PyString_AsString(objPtr);
+        if (string == NULL) {
+            PyErr_Format(PyExc_TypeError,
+                "bad value: %s: cannot convert to string",argName);
+            return RP_ERROR;
+        }
+        return StringToBoolean(string, resultPtr);
+    } else {
+        PyErr_Format(PyExc_TypeError,
+                "unknown python type for %s", argName);
+        return RP_ERROR;
+    }
+    *resultPtr = value;
+    return RP_OK;
+}
+
+static int 
+getArgCount (PyObject *args, PyObject *keywds, int *argc)
+{
+    int args_cnt = 0;
+    int keywds_cnt = 0;
+
+    if (argc == NULL) {
+        // incorrect use of function
+        // argc cannot be null
+        PyErr_Format(PyExc_ValueError,"getArgCount(): argc is NULL");
+        return RP_ERROR;
+    }
+    if (args != NULL) {
+        if (!PyTuple_Check(args)) {
+            PyErr_Format(PyExc_TypeError,
+                "getArgCount(): \'args\' should be a PyTuple");
+            return RP_ERROR;
+        }
+        args_cnt = PyTuple_Size(args);
+    }
+    if (keywds != NULL) {
+        if (!PyDict_Check(keywds)) {
+            PyErr_Format(PyExc_TypeError,
+                "getArgCount(): \'keywds\' should be a PyDict");
+            return RP_ERROR;
+        }
+        keywds_cnt = PyDict_Size(keywds);
+    }
+    *argc = args_cnt + keywds_cnt;
+    return RP_OK;
 }
 
@@ -91 +235 @@
 
 static PyObject *
-RpLibraryObject_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
+NewProc(PyTypeObject *type, PyObject *args, PyObject *kwds)
 {
     RpLibraryObject *self = NULL;
@@ -107 +251 @@
 
 static int
-RpLibraryObject_init(RpLibraryObject *self, PyObject *args, PyObject *kwds)
-{
-    PyObject *inObj = NULL;
-    char *filename = NULL;
-    int retVal = 1;
-
-    if (!PyArg_ParseTuple(args, "|O", &inObj)) {
+InitProc(RpLibraryObject *self, PyObject *args, PyObject *kwds)
+{
+    PyObject *objPtr;
+
+    if (!PyArg_ParseTuple(args, "|O", &objPtr)) {
         PyErr_Format(PyExc_TypeError,
             "library() takes at most 1 argument, a file name or a Rappture Library Object");
         return -1;
     }
-
-    if (inObj != NULL) {
-        if (PyString_Check(inObj)) {
-            filename = PyString_AsString(inObj);
+    if (objPtr != NULL) {
+        if (PyString_Check(objPtr)) {
+            const char *filename;
+
+            filename = PyString_AsString(objPtr);
             if (filename == NULL) {
                 PyErr_Format(PyExc_ValueError,"a file name is required");
             }
             self->lib = new RpLibrary(std::string(filename));
-        }
-        else if (RpLibraryObject_IsValid(inObj)) {
-            self->lib = new RpLibrary( *(RpLibraryObject_AsLibrary(inObj)) );
-        }
-        else if (RpLibraryObject_Check(inObj)) {
+        } else if (RpLibraryObject_IsValid(objPtr)) {
+            self->lib = new RpLibrary( *(RpLibraryObject_AsLibrary(objPtr)) );
+        } else if (RpLibraryObject_Check(objPtr)) {
             self->lib = new RpLibrary();
-        }
-        else {
+        } else {
             PyErr_Format(PyExc_TypeError,"unrecognized object type");
             return -1;
-        }
-    }
-    else {
+        } 
+    } else {
         self->lib = new RpLibrary();
     }
 
-    return retVal;
+    return -1;
 }
 
 static void
-RpLibraryObject_dealloc(RpLibraryObject *self)
+FreeProc(RpLibraryObject *self)
 {
     if (self) {
@@ -156 +295 @@
 }
 
-PyDoc_STRVAR(RpLibraryObject_copy_doc,
+PyDoc_STRVAR(CopyProcDoc,
 "copy (topath, frompath [, fromobj=$self]) -> None, copies data\n\
 \n\
@@ -173 +312 @@
 
 static PyObject *
-RpLibraryObject_copy(RpLibraryObject *self, PyObject *args, PyObject *keywds)
+CopyProc(RpLibraryObject *self, PyObject *args, PyObject *keywds)
 {
     char *topath = (char *)"";
@@ -235 +374 @@
 }
 
-PyDoc_STRVAR(RpLibraryObject_element_doc,
+PyDoc_STRVAR(ElementProcDoc,
 "element ([path=\'\'][, as=\'object\']) -> returns string or Rappture Library Object\n\
 \n\
@@ -254 +393 @@
 
 static PyObject *
-RpLibraryObject_element(RpLibraryObject *self, PyObject *args, PyObject *keywds)
+ElementProc(RpLibraryObject *self, PyObject *args, PyObject *keywds)
 {
     char* path = (char *)"";
@@ -275 +414 @@
 
     if (getArgCount(args,keywds,&argc) != RP_OK) {
-        // trouble ensues
-        // error message was set in getArgCount()
-        return NULL;
-    }
-
+        return NULL;
+    }
     if (argc > 2) {
-        // tested with ElementTests.testArguments_TooManyArgs()
         PyErr_Format(PyExc_TypeError,
             "element() takes at most 2 arguments (%i given)", argc);
@@ -287 +422 @@
     }
 
-    if (!PyArg_ParseTupleAndKeywords(args, keywds, "|ss",
-                kwlist, &path, &as)) {
+    if (!PyArg_ParseTupleAndKeywords(args, keywds, "|ss", kwlist, &path, &as)) {
         /* incorrect input values */
         // tested with ElementTests.testArguments_ArgsWrongType2()
@@ -298 +432 @@
 
     if (retlib != NULL) {
-        if (   (as == NULL)
-            || ((*as == 'o') && (strcmp("object",as) == 0)) ) {
+        if ((as == NULL) || ((*as == 'o') && (strcmp("object",as) == 0)) ) {
             // tested with ElementTests.testArguments_PathArg()
             retVal = RpLibraryObject_FromLibrary(retlib);
-        }
-        else if ((*as == 'c') && (strcmp("component",as) == 0)) {
+        } else if ((*as == 'c') && (strcmp("component",as) == 0)) {
             // tested with ElementTests.testArguments_TwoArgs()
             retVal = PyString_FromString(retlib->nodeComp().c_str());
-        }
-        else if ((*as == 'i') && (strcmp("id",as) == 0)) {
+        } else if ((*as == 'i') && (strcmp("id",as) == 0)) {
             // tested with ElementTests.testArguments_AsId()
             retVal = PyString_FromString(retlib->nodeId().c_str());
-        }
-        else if ((*as == 't') && (strcmp("type",as) == 0)) {
+        } else if ((*as == 't') && (strcmp("type",as) == 0)) {
             // tested with ElementTests.testArguments_AsKeywordArgs()
             retVal = PyString_FromString(retlib->nodeType().c_str());
-        }
-        else if ((*as == 'p') && (strcmp("path",as) == 0)) {
+        } else if ((*as == 'p') && (strcmp("path",as) == 0)) {
             // tested with ElementTests.testArguments_TwoKeywordArgs()
             retVal = PyString_FromString(retlib->nodePath().c_str());
-        }
-        else {
+        } else {
             // tested with ElementTests.testArguments_UnrecognizedAs()
             PyErr_Format(PyExc_ValueError,
@@ -325 +453 @@
         }
     }
-
     return (PyObject *)retVal;
 }
 
 
-PyDoc_STRVAR(RpLibraryObject_get_doc,
+PyDoc_STRVAR(GetProcDoc,
 "get ([path=\'\'][, decode=\'True\']) -> returns data at \'path\' as string\n\
 \n\
@@ -340 +467 @@
 
 static PyObject *
-RpLibraryObject_get(RpLibraryObject *self, PyObject *args, PyObject *keywds)
+GetProc(RpLibraryObject *self, PyObject *args, PyObject *keywds)
 {
     char* path = (char *)"";
 
     PyObject* decode = NULL;
-    int decodeVal = FALSE;
+    int decodeFlag;
 
     PyObject* retVal = NULL;
@@ -384 +511 @@
         return NULL;
     }
-    if (boolIntFromPyObject(decode,"yes", "decode", &decodeVal) != RP_OK) {
+    if (PyObjectToBoolean(decode,"yes", "decode", &decodeFlag) != RP_OK) {
         // tested with GetTests.testArgumentsDecodeError()
         return NULL;
     }
-
-    if (decodeVal) {
-        // tested with GetTests.testArgumentsDecode()
-        // tested with GetTests.testArgumentsDecodeYes()
-        // tested with GetTests.testArgumentsDecodeTrue)
-        // tested with GetTests.testArgumentsDecodeOn()
-        // tested with GetTests.testArgumentsDecode1Str()
-        // tested with GetTests.testArgumentsDecode1Int()
+    if (decodeFlag) {
         retValStr = self->lib->get(std::string(path));
         retVal = PyString_FromStringAndSize(retValStr.c_str(),retValStr.size());
-    }
-    else {
-        // tested with GetTests.testArgumentsNoDecodeNo()
-        // tested with GetTests.testArgumentsNoDecodeFalse()
-        // tested with GetTests.testArgumentsNoDecodeOff()
-        // tested with GetTests.testArgumentsNoDecode0Str()
-        // tested with GetTests.testArgumentsNoDecode0Int()
+    } else {
         retValBuf = self->lib->getData(std::string(path));
         retVal = PyString_FromStringAndSize(retValBuf.bytes(),retValBuf.size());
@@ -411 +525 @@
 }
 
-PyDoc_STRVAR(RpLibraryObject_parent_doc,
+#ifdef notdef
+PyDoc_STRVAR(ParentProcDoc,
 "parent ([path=\'\'][, as=\'object\']) -> returns string or Rappture Library Object\n\
 \n\
@@ -427 +542 @@
 
 static PyObject *
-RpLibraryObject_parent(RpLibraryObject *self, PyObject *args, PyObject *keywds)
+ParentProc(RpLibraryObject *self, PyObject *args, PyObject *keywds)
 {
     char* path = (char *)"";
@@ -484 +599 @@
     return (PyObject *)retVal;
 }
-
-PyDoc_STRVAR(RpLibraryObject_put_doc,
+#endif
+
+PyDoc_STRVAR(PutProcDoc,
 "put (path=\'\', value=\'\'[,id=None][,append=False][,type=\'string\'][,compress=False]) -> None\n\
 \n\
@@ -514 +630 @@
 
 static PyObject *
-RpLibraryObject_put(RpLibraryObject *self, PyObject *args, PyObject *keywds)
-{
-    char *path = (char *)"";
-
-    PyObject *value = NULL;
-    PyObject *valueStrObj = NULL;
-    char *value_char = NULL;
-    Py_ssize_t value_len = 0;
-
+PutProc(RpLibraryObject *self, PyObject *args, PyObject *keywds)
+{
+    char *path;
+    PyObject *compressObjPtr, *appendObjPtr, *valueObjPtr, *strObjPtr;
+    int appendFlag, compressFlag;
     char *id = NULL;
-
-    PyObject* append = NULL;
-    int appendInt = FALSE;
-
     char *type = (char *)"string";
-
-    PyObject* compress = NULL;
-    int compressInt = FALSE;
-
     int argc = 0;
-    int status = 0;
 
     static char *kwlist[] = {
@@ -551 +654 @@
         return NULL;
     }
-
-    status = getArgCount(args,keywds,&argc);
-    if (status != 0) {
-        // trouble ensues
-        // error message was set in getArgCount()
-        return NULL;
-    }
-
+    if (getArgCount(args,keywds,&argc) != RP_OK) {
+        return NULL;
+    }
     if (argc > 6) {
-        // tested with PutTests.testArguments_TooManyArgs()
-        PyErr_Format(PyExc_TypeError,
-            "put() takes at most 6 arguments (%i given)",argc);
-        return NULL;
-    }
-
+        PyErr_Format(PyExc_TypeError,
+            "put() takes at most 6 arguments (%i given)", argc);
+        return NULL;
+    }
     if (argc < 2) {
-        // tested with PutTests.testArguments_NotEnoughArgs()
-        PyErr_Format(PyExc_TypeError,
-            "put() takes at least 2 arguments (%i given)",argc);
-        return NULL;
-    }
-
-    if (!PyArg_ParseTupleAndKeywords(args, keywds, "sO|sOsO",
-            kwlist, &path, &value, &id, &append, &type, &compress)) {
-        // tested with PutTests.testArguments_ArgsWrongType2()
-        PyErr_Format(PyExc_TypeError, "incorrect arguments: put(path=\'\',value=\'\'[,id=None][,append=False][,type=\'string\'][,compress=False])");
-        return NULL;
-    }
-
-    if (value == NULL) {
+        PyErr_Format(PyExc_TypeError,
+            "put() takes at least 2 arguments (%i given)", argc);
+        return NULL;
+    }
+    if (!PyArg_ParseTupleAndKeywords(args, keywds, "sO|sOsO", kwlist, &path, 
+                &valueObjPtr, &id, &appendObjPtr, &type, &compressObjPtr)) {
+        return NULL;
+    }
+    if (valueObjPtr == NULL) {
         PyErr_Format(PyExc_ValueError, "put()'s \'value\' arg is required");
         return NULL;
     }
-
-    valueStrObj = PyObject_Str(value);
-
-    status = boolIntFromPyObject(append,"no","append",&appendInt);
-    if (status != 0) {
-        // error message set inside of boolIntFromPyObject
-        // tested with PutTests.testArguments_AppendValError()
-        return NULL;
-    }
-    status = boolIntFromPyObject(compress,"no","compress",&compressInt);
-    if (status != 0) {
-        // error message set inside of boolIntFromPyObject
-        // tested with PutTests.testArguments_CompressValError()
-        return NULL;
-    }
-
-    if (RpLibraryObject_IsValid(value)) {
-        // tested with PutTests.testPutObject()
-        self->lib->put( std::string(path),
-                        RpLibraryObject_AsLibrary(value), "", appendInt);
-    }
-    else if (valueStrObj != NULL) {
-
-        if (PyString_AsStringAndSize(valueStrObj, &value_char, &value_len) == -1) {
+    strObjPtr = PyObject_Str(valueObjPtr);
+
+    if (PyObjectToBoolean(appendObjPtr, "no", "append", &appendFlag) != RP_OK) {
+        return NULL;
+    }
+    if (PyObjectToBoolean(compressObjPtr, "no", "compress", &compressFlag) 
+        != RP_OK) {
+        return NULL;
+    }
+    if (RpLibraryObject_IsValid(valueObjPtr)) {
+        self->lib->put( std::string(path), 
+                RpLibraryObject_AsLibrary(valueObjPtr), "", appendFlag);
+    } else if (strObjPtr != NULL) {
+        char *string;
+        Py_ssize_t length;
+
+        if (PyString_AsStringAndSize(strObjPtr, &string, &length) == -1) {
             // user passed in an improper string
             // exception raised within fxn
             return NULL;
         }
-
-        if (   ( type == NULL )
-            || ( (*type == 's') && (strcmp("string", type) == 0) ) ) {
-            if (compressInt == 0) {
-                // tested with PutTests.testArgumentsCheckAppend()
-                // tested with PutTests.testArgumentsCheckAppendYes()
+        if ((type == NULL) || ((*type=='s') && (strcmp("string", type) == 0))) {
+            if (compressFlag == 0) {
                 self->lib->put( std::string(path),
-                                std::string(value_char), "", appendInt);
+                                std::string(string), "", appendFlag);
+            } else {
+                self->lib->putData(std::string(path), string, length, 
+                        appendFlag);
             }
-            else {
-                // tested with PutTests.testArgumentsCheckTypeStringCompressYes()
-                self->lib->putData( std::string(path),
-                                    value_char, value_len, appendInt);
-            }
-        }
-        else if ( (*type == 'f') && (strcmp("file",type) == 0) ) {
-            // tested with PutTests.testArgumentsCheckTypeFile()
-            // tested with PutTests.testArgumentsCheckTypeFileCompressTrue()
-            // tested with PutTests.testArgumentsCheckTypeFileCompressTrueNoDecode()
+        } else if ((*type == 'f') && (strcmp("file",type) == 0) ) {
             self->lib->putFile( std::string(path),
-                                std::string(PyString_AsString(valueStrObj)),
-                                compressInt, appendInt);
-        }
-        else {
-            // tested with PutTests.testArgumentsCheckTypeError()
+                                std::string(PyString_AsString(strObjPtr)),
+                                compressFlag, appendFlag);
+        } else {
             PyErr_Format(PyExc_ValueError,
                 "\'type\' arg must be \'string\' or \'file\'");
             return NULL;
         }
-    }
-    else {
+    } else {
         PyErr_Format(PyExc_TypeError,
             "put()'s \'value\' arg must be a string or Rappture Library Object");
         return NULL;
     }
-
     Py_RETURN_NONE;
 }
 
-PyDoc_STRVAR(RpLibraryObject_xml_doc,
+PyDoc_STRVAR(XmlProcDoc,
 "xml () -> returns xml string\n\
 \n\
@@ -659 +729 @@
 
 static PyObject*
-RpLibraryObject_xml(RpLibraryObject *self)
+XmlProc(RpLibraryObject *self)
 {
     PyObject *retStr = NULL;
@@ -673 +743 @@
 }
 
-PyDoc_STRVAR(RpLibraryObject_result_doc,
+PyDoc_STRVAR(ResultProcDoc,
 "result ([status=0]) -> None, send results back to graphical user interface\n\
 \n\
@@ -681 +751 @@
 
 static PyObject*
-RpLibraryObject_result(RpLibraryObject *self, PyObject *args, PyObject *keywds)
+ResultProc(RpLibraryObject *self, PyObject *args, PyObject *keywds)
 {
     int argc = 0;
@@ -696 +766 @@
         return NULL;
     }
-
-    status = getArgCount(args,keywds,&argc);
-    if (status != 0) {
+    if (getArgCount(args,keywds,&argc) != RP_OK) {
         // trouble ensues
         // error message was set in getArgCount()
@@ -709 +777 @@
         return NULL;
     }
-
     if (!PyArg_ParseTupleAndKeywords(args, keywds, "|i", kwlist, &status)) {
         // tested with ResultTests.testArguments_InvalidStatusArg()
@@ -715 +782 @@
         return NULL;
     }
-
-    self->lib->put("tool.version.rappture.language","python");
+    self->lib->put("tool.version.rappture.language", "python");
     self->lib->result(status);
 
@@ -724 +790 @@
 static PyMethodDef RpLibraryObject_methods[] = {
 
-    {"copy", (PyCFunction)RpLibraryObject_copy, METH_VARARGS|METH_KEYWORDS,
-        RpLibraryObject_copy_doc},
+    {"copy", (PyCFunction)CopyProc, METH_VARARGS|METH_KEYWORDS, CopyProcDoc},
 
 /*
-    {"children", (PyCFunction)RpLibraryObject_children, METH_VARARGS|METH_KEYWORDS,
-        RpLibraryObject_children_doc},
+    {"children", (PyCFunction)ChildrenProc, METH_VARARGS|METH_KEYWORDS,
+        ChildrenProcDoc},
 */
 
-    {"element", (PyCFunction)RpLibraryObject_element, METH_VARARGS|METH_KEYWORDS,
-        RpLibraryObject_element_doc},
-
-    {"get", (PyCFunction)RpLibraryObject_get, METH_VARARGS|METH_KEYWORDS,
-        RpLibraryObject_get_doc},
+    {"element", (PyCFunction)ElementProc, METH_VARARGS|METH_KEYWORDS,
+        ElementProcDoc},
+
+    {"get", (PyCFunction)GetProc, METH_VARARGS|METH_KEYWORDS, GetProcDoc},
 
 /*
-    {"parent", (PyCFunction)RpLibraryObject_parent, METH_VARARGS|METH_KEYWORDS,
-        RpLibraryObject_put_doc},
+    {"parent", (PyCFunction)ParentProc, METH_VARARGS|METH_KEYWORDS,
+         ParentProcDoc},
 */
 
-    {"put", (PyCFunction)RpLibraryObject_put, METH_VARARGS|METH_KEYWORDS,
-        RpLibraryObject_put_doc},
+    {"put", (PyCFunction)PutProc, METH_VARARGS|METH_KEYWORDS, PutProcDoc},
 
 /*
-    {"remove", (PyCFunction)RpLibraryObject_remove, METH_VARARGS|METH_KEYWORDS,
-        RpLibraryObject_remove_doc},
+    {"remove", (PyCFunction)RemoveProc, METH_VARARGS|METH_KEYWORDS,
+        RemoveProcDoc},
 */
 
-    {"xml", (PyCFunction)RpLibraryObject_xml, METH_NOARGS,
-        RpLibraryObject_xml_doc},
-
-    {"result", (PyCFunction)RpLibraryObject_result, METH_VARARGS|METH_KEYWORDS,
-        RpLibraryObject_result_doc},
-
-    {NULL,        NULL}        /* sentinel */
+    {"xml", (PyCFunction)XmlProc, METH_NOARGS, XmlProcDoc},
+
+    {"result", (PyCFunction)ResultProc, METH_VARARGS|METH_KEYWORDS, 
+        ResultProcDoc},
+
+    {NULL,        NULL}                 /* sentinel */
 };
 
@@ -769 +831 @@
     0,                                    /*tp_itemsize*/
     /* methods */
-    (destructor)RpLibraryObject_dealloc,  /*tp_dealloc*/
+    (destructor)FreeProc,                 /*tp_dealloc*/
     0,                                    /*tp_print*/
     0,                                    /*tp_getattr*/
@@ -800 +862 @@
     0,                                    /*tp_descr_set*/
     0,                                    /*tp_dictoffset*/
-    (initproc)RpLibraryObject_init,       /*tp_init*/
+    (initproc)InitProc,                   /*tp_init*/
     0,                                    /*tp_alloc*/
-    RpLibraryObject_new,                  /*tp_new*/
+    NewProc,                              /*tp_new*/
     0,                                    /*tp_new*/
 };
@@ -845 +907 @@
 }
 
-/*
- *  int boolAsInt (inVal, outVal)
- *
- *  represent a boolean string as an integer.
- *
- *  outVal set to 1 if the boolean value inVal could
- *  be associated with any of the following strings:
- *  "yes", "on", "true", "1".
- *
- *  outVal set to 0 if the boolean value inVal could
- *  be associated with any of the following strings:
- *  "no", "off", "false", "0".
- *
- *  returns a status integer to tell if the operation
- *  was successful (0) of if there was an error (!0)
- *
- *  note: string comparisons are case insensitive.
- */
-
-static int
-boolAsInt(const char *string, int *resultPtr)
-{
-    char c;
-
-    if ((string == NULL) || (resultPtr == NULL) ) {
-        PyErr_Format(PyExc_TypeError,
-                     "incorrect use of boolAsInt(inVal,outVal)");
-        return RP_ERROR;
-    }
-    c = tolower(string[0]);
-    if ((c == 'y') && (strcasecmp(string, "yes") == 0)) {
-        *resultPtr = TRUE;
-    } else if ((c == 'n') && (strcasecmp(string, "no") == 0)) {
-        *resultPtr = FALSE;
-    } else if ((c == 'o') && (strcasecmp(string, "on") == 0)) {
-        *resultPtr = TRUE;
-    } else if ((c == 'o') && (strcasecmp(string, "off") == 0)) {
-        *resultPtr = FALSE;
-    } else if ((c == 't') && (strcasecmp(string, "true") == 0)) {
-        *resultPtr = TRUE;
-    } else if ((c == 'f') && (strcasecmp(string, "false") == 0)) {
-        *resultPtr = FALSE;
-    } else if ((c == '1') && (strcasecmp(string, "1") == 0)) {
-        *resultPtr = TRUE;
-    } else if ((c == '0') && (strcasecmp(string, "0") == 0)) {
-        *resultPtr = FALSE;
-    } else {
-        PyErr_Format(PyExc_ValueError,
-            "unrecognized input: %s: should be one of: \'yes\',\'true\',\'on\',\'1\',1,True,\'no\',\'false\',\'off\',\'0\',0,False", string);
-        return RP_ERROR;
-    }
-    return RP_OK;
-}
-
-static int
-boolIntFromPyObject (PyObject *objPtr, const char *defValue, 
-                     const char *argName, int *resultPtr)
-{
-    int value;
-
-    value = FALSE;                      // Suppress compiler warning.
-    if ((defValue == NULL) || (argName == NULL) || (resultPtr == NULL)) {
-        // incorrect use of function
-        PyErr_Format(PyExc_ValueError,
-            "boolIntFromPyObject(): defValue or argName or resultPtr is NULL");
-        return RP_ERROR;
-    }
-    if (objPtr == NULL) {
-        return boolAsInt(defValue, resultPtr);
-    }
-    if (PyBool_Check(objPtr)) {
-        value = PyObject_IsTrue(objPtr);
-        if (value < 0) {
-             PyErr_Format(PyExc_ValueError, 
-                "boolIntFromPyObject(): bad boolean object");
-            return RP_ERROR;
-        }
-    } else if (PyLong_Check(objPtr)) {
-        long l;
-
-        l = PyLong_AsLong(objPtr);
-        value = (l == 0) ? FALSE : TRUE;
-    } else if (PyInt_Check(objPtr)) {
-        long l;
-
-        l = PyInt_AsLong(objPtr);
-        value = (l == 0) ? FALSE : TRUE;
-    } else if (PyFloat_Check(objPtr)) {
-        double d;
-
-        d = PyFloat_AS_DOUBLE(objPtr);
-        value = (d == 0.0) ? FALSE : TRUE;
-    } else if (PyString_Check(objPtr)) {
-        const char *string;
-        
-        string = PyString_AsString(objPtr);
-        if (string == NULL) {
-            PyErr_Format(PyExc_TypeError,
-                "bad value: %s: cannot convert to string",argName);
-            return RP_ERROR;
-        }
-        return boolAsInt(string, resultPtr);
-    } else {
-        PyErr_Format(PyExc_TypeError,
-                "unknown python type for %s", argName);
-        return RP_ERROR;
-    }
-    *resultPtr = value;
-    return RP_OK;
-}
-
-static int 
-getArgCount (PyObject *args, PyObject *keywds, int *argc)
-{
-    int args_cnt = 0;
-    int keywds_cnt = 0;
-
-    if (argc == NULL) {
-        // incorrect use of function
-        // argc cannot be null
-        PyErr_Format(PyExc_ValueError,"getArgCount(): argc is NULL");
-        return RP_ERROR;
-    }
-    if (args != NULL) {
-        if (!PyTuple_Check(args)) {
-            PyErr_Format(PyExc_TypeError,
-                "getArgCount(): \'args\' should be a PyTuple");
-            return RP_ERROR;
-        }
-        args_cnt = PyTuple_Size(args);
-    }
-    if (keywds != NULL) {
-        if (!PyDict_Check(keywds)) {
-            PyErr_Format(PyExc_TypeError,
-                "getArgCount(): \'keywds\' should be a PyDict");
-            return RP_ERROR;
-        }
-        keywds_cnt = PyDict_Size(keywds);
-    }
-    *argc = args_cnt + keywds_cnt;
-    return RP_OK;
-}
-
 /* ---------- */