Changeset 808 for trunk/python

Timestamp:

Oct 29, 2007, 1:16:24 PM (17 years ago)

Author:

dkearney

Message:

allow the user to create a new empty rappture library object in c++ and python bindings. this is useful when you want to create new xml files.

File:

• trunk/python/Rappture/PyRpLibrary.cc (modified) (1 diff)

trunk/python/Rappture/PyRpLibrary.cc

@@ -95 +95 @@
     int retVal = 1;
 
-    if (!PyArg_ParseTuple(args, "O", &inObj)) {
+    if (!PyArg_ParseTuple(args, "|O", &inObj)) {
         PyErr_Format(PyExc_TypeError,
-            "library() takes 1 argument, a file name or a Rappture Library Object");
+            "library() takes at most 1 argument, a file name or a Rappture Library Object");
         return -1;
     }
 
-    if (PyString_Check(inObj)) {
-        filename = PyString_AsString(inObj);
-        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)) {
+    if (inObj != NULL) {
+        if (PyString_Check(inObj)) {
+            filename = PyString_AsString(inObj);
+            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)) {
+            self->lib = new RpLibrary();
+        }
+        else {
+            PyErr_Format(PyExc_TypeError,"unrecognized object type");
+            return -1;
+        }
+    }
+    else {
         self->lib = new RpLibrary();
-    }
-    else {
-        PyErr_Format(PyExc_TypeError,"unrecognized object type");
-        return -1;
     }