Changeset 5151 for nappy


Ignore:
Timestamp:
30/03/09 21:43:42 (10 years ago)
Author:
astephen
Message:

Fixed some import issues.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • nappy/trunk/nappy/nappy_api.py

    r5125 r5151  
    143143chooseFFI = nappy.utils.common_utils.chooseFFI 
    144144getNAFileClass = nappy.utils.common_utils.getNAFileClass 
     145getFileNameWithNewExtension = nappy.utils.common_utils.getFileNameWithNewExtension 
     146 
    145147__version__ = nappy.utils.common_utils.getVersion() 
    146148default_delimiter = nappy.utils.common_utils.getDefault("default_delimiter") 
     
    201203    convertor.convert() 
    202204    if nc_file == None: 
    203         nc_file = nappy.utils.getFileNameWithNewExtension(na_file, "nc") 
     205        nc_file = getFileNameWithNewExtension(na_file, "nc") 
    204206    convertor.writeNCFile(nc_file, mode) 
    205207    return nc_file    
     
    223225 
    224226    if csv_file == None: 
    225         csv_file = nappy.utils.getFileNameWithNewExtension(nc_file, "csv") 
     227        csv_file = getFileNameWithNewExtension(nc_file, "csv") 
    226228    fout = openNAFile(csv_file, "w", na_dict=na_dict) 
    227229    fout.write(delimiter=",", annotation=annotation) 
     
    268270 
    269271    if na_file == None: 
    270         na_file =  nappy.utils.getFileNameWithNewExtension(nc_file, "na") 
     272        na_file =  getFileNameWithNewExtension(nc_file, "na") 
    271273 
    272274    import nappy.nc_interface.nc_to_na 
     
    292294    """ 
    293295    if csv_file == None: 
    294         csv_file = nappy.utils.getFileNameWithNewExtension(nc_file, "csv") 
     296        csv_file = getFileNameWithNewExtension(nc_file, "csv") 
    295297        arg_dict["na_file"] = csv_file 
    296298        arg_dict["delimiter"] = "," 
Note: See TracChangeset for help on using the changeset viewer.