Changeset 114

Show
Ignore:
Timestamp:
06/29/07 09:40:23 (1 year ago)
Author:
apdavison
Message:

wikidoc.py now does a relative import of ../common, to ensure that wikidoc reports on the correct API version, rather than on that version that happens to be on sys.path

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/0.3/doc/wikidoc.py

    r113 r114  
    33 
    44import sys 
    5 import pyNN.common 
    65import types, string, re, logging 
    7  
    8  
     6import imp, os 
     7common = imp.load_source('common', os.path.join('..','common.py')) 
     8print common 
    99 
    1010#-- Define global data --------------------------------------------------------- 
     
    141141    # gather information from the common module 
    142142    logging.info("Gathering information from the common module.") 
    143     for entry in dir(pyNN.common): 
     143    for entry in dir(common): 
    144144        if entry not in exclude: 
    145             instance = eval('pyNN.common.%s' % entry) 
     145            instance = eval('common.%s' % entry) 
    146146            entry_type = type(instance) 
    147147            logging.info('  %-30s %s' % (entry,entry_type)) 
     
    150150                for classentry in dir(instance): 
    151151                    if classentry not in exclude and (classentry[0] != '_' or classentry[0:2] == '__'): # don't include private methods 
    152                         classentry_type = type(eval('pyNN.common.%s.%s' % (entry,classentry))) 
     152                        classentry_type = type(eval('common.%s.%s' % (entry,classentry))) 
    153153                        logging.info('    %-28s %s' % (classentry,classentry_type)) 
    154154                        if classentry_type == types.MethodType: 
     
    179179    outputStr += category_fmt % "Data" 
    180180    for element in data: 
    181         instance = eval('pyNN.common.%s' % element) 
     181        instance = eval('common.%s' % element) 
    182182        if type(instance) == types.DictType: 
    183183            outputStr += dict_fmt % element 
     
    195195    outputStr += category_fmt % "Functions" 
    196196    for funcname in functions: 
    197         funcinst = eval('pyNN.common.%s' % funcname) 
     197        funcinst = eval('common.%s' % funcname) 
    198198        outputStr += function_fmt % func_sig(funcinst, default_arg_fmt, func_sig_fmt) 
    199199        if funcinst.__doc__: 
     
    208208        if classname.find('Error') > -1: 
    209209            error_classes[classname] = classes[classname] 
    210         elif issubclass(eval('pyNN.common.%s' % classname),pyNN.common.StandardCellType): 
     210        elif issubclass(eval('common.%s' % classname),common.StandardCellType): 
    211211            celltype_classes[classname] = classes[classname] 
    212212        else: 
     
    225225        for classname in classlist: 
    226226            outputStr += class_fmt % classname 
    227             docstr = eval('pyNN.common.%s.__doc__' % classname) 
     227            docstr = eval('common.%s.__doc__' % classname) 
    228228            if docstr: 
    229229                outputStr += _(docstr) 
    230230            for methodname in classes[classname]['methods']: 
    231                 methodinst = eval('pyNN.common.%s.%s' % (classname,methodname)) 
     231                methodinst = eval('common.%s.%s' % (classname,methodname)) 
    232232                fs = func_sig(methodinst, default_arg_fmt, func_sig_fmt) 
    233233                if fs: 
     
    236236                        outputStr += _(methodinst.__doc__.strip()) 
    237237            for methodname in classes[classname]['staticmethods']: 
    238                 methodinst = eval('pyNN.common.%s.%s' % (classname,methodname)) 
     238                methodinst = eval('common.%s.%s' % (classname,methodname)) 
    239239                fs = func_sig(methodinst, default_arg_fmt, func_sig_fmt) 
    240240                if fs: 
     
    243243                        outputStr += _(methodinst.__doc__.strip()) 
    244244            for element in classes[classname]['data']: 
    245                 instance = eval('pyNN.common.%s.%s' % (classname,element)) 
     245                instance = eval('common.%s.%s' % (classname,element)) 
    246246                if type(instance) == types.DictType: 
    247247                    outputStr += dict_fmt % element