Changeset 3330 for nappy/trunk/nappy/na_file/na_file_1001.py

Timestamp:

08/02/08 20:03:23 (13 years ago)

Author:

astephen

Message:

 

File:

• nappy/trunk/nappy/na_file/na_file_1001.py (modified) (3 diffs)

nappy/trunk/nappy/na_file/na_file_1001.py

@@ -14 +14 @@
 
 # Imports from local package
-import utils.text_parser
+import nappy.utils.text_parser
 import nappy.na_file.na_file
 
-class NAFile1001(nappy.na_file.naFile.NAFile):
+class NAFile1001(nappy.na_file.na_file.NAFile):
     """
     Class to read, write and interact with NASA Ames files conforming to the
@@ -28 +28 @@
         """
         self._readCommonHeader()
-        self.DX = utils.text_parser.readItemsFromLine(self.file.readline(), self.NIV, float)
-        self.XNAME = utils.text_parser.readItemsFromLines(self._readLines(self.NIV), self.NIV, str)
+        self.DX = nappy.utils.text_parser.readItemsFromLine(self.file.readline(), self.NIV, float)
+        self.XNAME = nappy.utils.text_parser.readItemsFromLines(self._readLines(self.NIV), self.NIV, str)
         self._readVariablesHeaderSection()
         self._readComments()
@@ -59 +59 @@
         Reads first line/section of current block of data.
         """
-        (x_and_v, rtlines) = utils.text_parser.readItemsFromUnknownLines(datalines, 1 + self.NV, float)
+        (x_and_v, rtlines) = nappy.utils.text_parser.readItemsFromUnknownLines(datalines, 1 + self.NV, float)
         (x, v) = (x_and_v[0], x_and_v[1:])
         self.X.append(x)