Changeset 3526 for nappy


Ignore:
Timestamp:
26/02/08 19:39:40 (11 years ago)
Author:
astephen
Message:

Updates to config parser and test.

Location:
nappy/trunk/nappy
Files:
1 deleted
1 edited

Legend:

Unmodified
Added
Removed
  • nappy/trunk/nappy/utils/parse_config.py

    r3517 r3526  
    1515config_file = os.path.join(base_dir, "nappy.ini") 
    1616config_dict = None 
    17 annotations_config_file = os.path.join(base_dir, "annotations.ini") 
    1817annotations_config_dict = None 
    1918 
     
    5251    return config_dict 
    5352 
    54 def makeAnnotationsConfigDict(af=annotations_config_file): 
     53def makeAnnotationsConfigDict(af): 
    5554    """ 
    5655    Parses annotations config file and returns dictionary of annotations. 
     
    6766    return ad 
    6867 
    69 def getAnnotationsConfigDict(af=annotations_config_file): 
     68def getAnnotationsConfigDict(): 
    7069    "Checks if already made and only makes if required." 
     70    config_dict = getConfigDict() 
     71    annotations_config_file = config_dict["main"]["annotations_file"] 
     72    af = os.path.join(base_dir, annotations_config_file) 
    7173    global annotations_config_dict 
    7274    if annotations_config_dict == None: 
Note: See TracChangeset for help on using the changeset viewer.