Ignore:
Timestamp:
25/03/09 08:58:07 (11 years ago)
Author:
spascoe
Message:

Merging changes in the nappy package from trunk

File:
1 edited

Legend:

Unmodified
Added
Removed
  • nappy/branches/nappy-eggable/nappy/nappy_api.py

    r4693 r5138  
    197197        del arg_dict[arg_out] 
    198198 
    199     convertor = apply(nappy.nc_convertor.na_to_nc.NAToNC, [], arg_dict) 
     199    import nappy.nc_interface.na_to_nc 
     200    convertor = apply(nappy.nc_interface.na_to_nc.NAToNC, [], arg_dict) 
    200201    convertor.convert() 
    201202    if nc_file == None: 
     
    269270        na_file =  nappy.utils.getFileNameWithNewExtension(nc_file, "na") 
    270271 
    271     convertor = apply(nappy.nc_convertor.nc_to_na.NCToNA, [], arg_dict) 
     272    import nappy.nc_interface.nc_to_na 
     273    convertor = apply(nappy.nc_interface.nc_to_na.NCToNA, [], arg_dict) 
    272274    convertor.convert() 
    273275 
Note: See TracChangeset for help on using the changeset viewer.