Changeset 5151 for nappy/trunk

Timestamp:

30/03/09 21:43:42 (11 years ago)

Author:

astephen

Message:

Fixed some import issues.

File:

• nappy/trunk/nappy/nappy_api.py (modified) (5 diffs)

nappy/trunk/nappy/nappy_api.py

@@ -143 +143 @@
 chooseFFI = nappy.utils.common_utils.chooseFFI
 getNAFileClass = nappy.utils.common_utils.getNAFileClass
+getFileNameWithNewExtension = nappy.utils.common_utils.getFileNameWithNewExtension
+
 __version__ = nappy.utils.common_utils.getVersion()
 default_delimiter = nappy.utils.common_utils.getDefault("default_delimiter")
@@ -201 +203 @@
     convertor.convert()
     if nc_file == None:
-        nc_file = nappy.utils.getFileNameWithNewExtension(na_file, "nc")
+        nc_file = getFileNameWithNewExtension(na_file, "nc")
     convertor.writeNCFile(nc_file, mode)
     return nc_file   
@@ -223 +225 @@
 
     if csv_file == None:
-        csv_file = nappy.utils.getFileNameWithNewExtension(nc_file, "csv")
+        csv_file = getFileNameWithNewExtension(nc_file, "csv")
     fout = openNAFile(csv_file, "w", na_dict=na_dict)
     fout.write(delimiter=",", annotation=annotation)
@@ -268 +270 @@
 
     if na_file == None:
-        na_file =  nappy.utils.getFileNameWithNewExtension(nc_file, "na")
+        na_file =  getFileNameWithNewExtension(nc_file, "na")
 
     import nappy.nc_interface.nc_to_na
@@ -292 +294 @@
     """
     if csv_file == None:
-        csv_file = nappy.utils.getFileNameWithNewExtension(nc_file, "csv")
+        csv_file = getFileNameWithNewExtension(nc_file, "csv")
         arg_dict["na_file"] = csv_file
         arg_dict["delimiter"] = ","