Changeset 790


Ignore:
Timestamp:
Jul 30, 2007 6:36:25 PM (14 years ago)
Author:
dkearney
Message:

changed the name of the python !Library module to library

Location:
trunk/python
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/python/Rappture/Library.cc

    r787 r790  
    2626
    2727/*
    28  * Check to see if this object is a Rappture.Library object.
     28 * Check to see if this object is a Rappture.library object.
    2929 * This does not check to see if the object is correctly
    3030 * initialized. To check for correct object type and
     
    3939    if (o != NULL) {
    4040        if (    (*(o->ob_type->tp_name) == 'R')
    41              && (strcmp(o->ob_type->tp_name,"Rappture.Library") == 0) ) {
     41             && (strcmp(o->ob_type->tp_name,"Rappture.library") == 0) ) {
    4242            retval = 1;
    4343        }
     
    4848
    4949/*
    50  * Check to see if this object is a Rappture.Library object
     50 * Check to see if this object is a Rappture.library object
    5151 * and is correctly initialized
    5252 *
    5353 * This function calls RpLibraryObject_Check internally, and is used
    5454 * in most of the internal functions to check if an object being passed
    55  * in by the user is a valid Rappture.Library object
     55 * in by the user is a valid Rappture.library object
    5656 */
    5757
     
    9797    if (!PyArg_ParseTuple(args, "O", &inObj)) {
    9898        PyErr_Format(PyExc_TypeError,
    99             "Library() takes 1 argument, a file name or a Rappture Library Object");
     99            "library() takes 1 argument, a file name or a Rappture Library Object");
    100100        return -1;
    101101    }
     
    738738    PyObject_HEAD_INIT(NULL)
    739739    0,                                    /*ob_size*/
    740     "Rappture.Library",                   /*tp_name*/
     740    "Rappture.library",                   /*tp_name*/
    741741    sizeof(RpLibraryObject),              /*tp_basicsize*/
    742742    0,                                    /*tp_itemsize*/
     
    758758    0,                                    /*tp_as_buffer*/
    759759    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,   /*tp_flags*/
    760     "Rappture.Library Object",            /*tp_doc*/
     760    "Rappture.library Object",            /*tp_doc*/
    761761    0,                                    /*tp_traverse*/
    762762    0,                                    /*tp_clear*/
     
    991991
    992992PyMODINIT_FUNC
    993 initLibrary(void)
     993initlibrary(void)
    994994{
    995995    PyObject *m;
     
    10021002
    10031003    /* Create the module and add the functions */
    1004     m = Py_InitModule3("Library", Library_Methods, module_doc);
     1004    m = Py_InitModule3("library", Library_Methods, module_doc);
    10051005
    10061006    /* Add some symbolic constants to the module */
     
    10121012
    10131013    Py_INCREF(&RpLibraryObjectType);
    1014     PyModule_AddObject(m, "Library", (PyObject*) &RpLibraryObjectType);
     1014    PyModule_AddObject(m, "library", (PyObject*) &RpLibraryObjectType);
    10151015
    10161016    Py_XINCREF(ErrorObject);
  • trunk/python/Rappture/__init__.py

    r787 r790  
    88import Units
    99import Utils
    10 import Library
    1110import encoding
  • trunk/python/Rappture/unittest_library.py

    r787 r790  
    1717
    1818    def setUp(self):
    19         self.lib  = Rappture.Library.Library("test.xml")
    20         self.lib2 = Rappture.Library.Library("test.xml")
    21         # self.lib3 = Rappture.Library.Library()
     19        self.lib  = Rappture.library("test.xml")
     20        self.lib2 = Rappture.library("test.xml")
     21        # self.lib3 = Rappture.library()
    2222
    2323    def tearDown(self):
     
    217217
    218218    def setUp(self):
    219         self.lib = Rappture.Library.Library("test.xml")
     219        self.lib = Rappture.library("test.xml")
    220220
    221221    def tearDown(self):
     
    258258
    259259    def setUp(self):
    260         self.lib = Rappture.Library.Library("test.xml")
     260        self.lib = Rappture.library("test.xml")
    261261
    262262    def tearDown(self):
     
    344344
    345345    def setUp(self):
    346         self.lib = Rappture.Library.Library("test.xml")
     346        self.lib = Rappture.library("test.xml")
    347347
    348348    def tearDown(self):
     
    484484
    485485    def setUp(self):
    486         self.lib = Rappture.Library.Library("test.xml")
     486        self.lib = Rappture.library("test.xml")
    487487
    488488    def tearDown(self):
     
    537537
    538538    def setUp(self):
    539         self.lib = Rappture.Library.Library("test.xml")
     539        self.lib = Rappture.library("test.xml")
    540540
    541541    def tearDown(self):
  • trunk/python/setup.py.in

    r787 r790  
    33rp_install_dir = '@prefix@'
    44
    5 library_module = Extension('Rappture.Library',
     5library_module = Extension('Rappture.library',
    66                   include_dirs = [rp_install_dir+'/include', '../include'],
    77                   sources = [ 'Rappture/Library.cc' ],
     
    3131        description='Rapid Application Infrastructure library for nanoHUB.org',
    3232        url='http://www.nanohub.org/',
    33         py_modules=[ 'Rappture.library',
    34                      'Rappture.interface',
     33        py_modules=[ 'Rappture.interface',
    3534                     'Rappture.number',
    3635                     'Rappture.queue',
Note: See TracChangeset for help on using the changeset viewer.