Changeset 23689 for issm/trunk-jpl/src/py3/archive/arch.py

Timestamp:

02/04/19 12:50:23 (6 years ago)

Author:

bdef

Message:

CHG: py3 migration

File:

• issm/trunk-jpl/src/py3/archive/arch.py (modified) (21 diffs)

issm/trunk-jpl/src/py3/archive/arch.py

@@ -1 +1 @@
 import numpy as np
-import math
 import struct
-import sys
-import os
+from os import path
 from collections import OrderedDict
 
@@ -18 +16 @@
         # open file
         try:
-                if not os.path.isfile(filename):
+                if not path.isfile(filename):
                         fid=open(filename,'wb')
                 else:
@@ -31 +29 @@
                 name=args[2*i]
                 write_field_name(fid,name)
-                
+
                 # write data associated with field name
                 data=args[2*i+1]
@@ -43 +41 @@
                 else:
                         raise ValueError("archwrite : error writing data, invalid code entered '%d'" % code)
-        
+
         fid.close()
 
@@ -55 +53 @@
         """
         try:
-                if os.path.isfile(filename):
+                if path.isfile(filename):
                         fid=open(filename,'rb')
                 else:
@@ -61 +59 @@
         except IOError as e:
                 raise IOError("archread error : could not open file '%s' to read from" % filename)
-        
+
         archive_results=[]
 
         # read first result
         result=read_field(fid)
+
         while result:
                 if fieldname == result['field_name']:
@@ -71 +70 @@
                         archive_results=result['data']; # we only want the data
                         break
-                
+
                 # read next result
                 result=read_field(fid)
-        
+
         # close file
         fid.close()
-        
+
         return archive_results
 # }}}
@@ -88 +87 @@
         """
         try:
-                if os.path.isfile(filename):
+                if path.isfile(filename):
                         fid=open(filename,'rb')
                 else:
@@ -94 +93 @@
         except IOError as e:
                 raise IOError("archread error : could not open file '%s' to read from" % filename)
-        
+
         print('Source file: ')
         print('\t{0}'.format(filename))
@@ -106 +105 @@
                 # go to next result
                 result=read_field(fid)
-        
+
         # close file
         fid.close()
@@ -112 +111 @@
 # }}}
 
-# Helper functions 
+# Helper functions
 def write_field_name(fid,data): # {{{
         """
@@ -121 +120 @@
         reclen=len(data)+4+4
         fid.write(struct.pack('>i',reclen))
-        
+
         # write format code
         code=format_archive_code(data);
@@ -130 +129 @@
         # write string length, and then the string
         fid.write(struct.pack('>i',len(data)))
-        fid.write(struct.pack('>%ds' % len(data),data))
+        fid.write(struct.pack('>{}s'.format(len(data)),data.encode('utf8')))
 # }}}
 def write_scalar(fid,data): # {{{
@@ -143 +142 @@
         # write the format code (2 for scalar)
         fid.write(struct.pack('>i',2))
-        
+
         # write the double
         fid.write(struct.pack('>d',data))
@@ -158 +157 @@
         elif isinstance(data,(list,tuple)):
                 data=np.array(data).reshape(-1,)
-        
+
         if np.ndim(data) == 1:
                 if np.size(data):
@@ -164 +163 @@
                 else:
                         data=data.reshape(0,0)
-        
+
         # get size of data
         sz=data.shape
@@ -175 +174 @@
                 raise ValueError("archwrite error : can not write vector to binary file because it is too large")
         fid.write(struct.pack('>i',reclen))
-        
+
         # write format code
         fid.write(struct.pack('>i',3))
@@ -204 +203 @@
                         raise ValueError('archread error : a string was not present at the start of the arch file')
                 namelen=struct.unpack('>i',fid.read(struct.calcsize('>i')))[0]
-                fieldname=struct.unpack('>%ds' % namelen,fid.read(namelen))[0]
-                
+                fieldname=struct.unpack('>{}s'.format(namelen),fid.read(namelen))[0]
+
                 # then, read the data
                 datalen=struct.unpack('>i',fid.read(struct.calcsize('>i')))[0]
@@ -211 +210 @@
 
                 if data_type==2:
-                        # unpack scalar
+                        # struct.upack scalar
                         data=struct.unpack('>d',fid.read(struct.calcsize('>d')))[0]
                 elif data_type==3:
@@ -218 +217 @@
                         raw_data=np.zeros(shape=(rows,cols),dtype=float)
                         for i in range(rows):
-                                raw_data[i,:]=struct.unpack('>%dd' % cols,fid.read(cols*struct.calcsize('>d')))
-                        # The matrix will be unpacked in order and will be filled left -> right by column
+                                raw_data[i,:]=struct.unpack('>{}d'.format(cols),fid.read(cols*struct.calcsize('>d')))
+                        # The matrix will be struct.upacked in order and will be filled left -> right by column
                         # We need to reshape and transpose the matrix so it can be read correctly
                         data=raw_data.reshape(raw_data.shape[::-1]).T
                 else:
                         raise TypeError("Cannot read data type %d" % data_type)
-                        
+
                 # give additional data to user
                 if data_type==2:
@@ -234 +233 @@
 
                 result=OrderedDict()
-                result['field_name']=fieldname
+                result['field_name']=fieldname.decode('utf8')
                 result['size']=data_size
                 result['data_type']=data_type_str