Changeset 23670 for issm/trunk-jpl/src/py3/classes/verbose.py

Timestamp:

01/31/19 07:34:11 (6 years ago)

Author:

bdef

Message:

CHG: python scripts after 2to3 and indentation fix

File:

• issm/trunk-jpl/src/py3/classes/verbose.py (modified) (5 diffs)

issm/trunk-jpl/src/py3/classes/verbose.py

@@ -1 +1 @@
 from pairoptions import pairoptions
 import MatlabFuncs as m
-from EnumDefinitions import *
 from WriteData import WriteData
 
@@ -29 +28 @@
         """
 
-        def __init__(self,*args,**kwargs):    # {{{
+        def __init__(self,*args):    # {{{
                 #BEGINFIELDS
                 self.mprocessor  = False
@@ -42 +41 @@
                 #ENDFIELDS
 
-                if not kwargs and not args:
+                if not len(args):
                         #Don't do anything
                         self.solution=True;
@@ -64 +63 @@
                 else:
                         #Use options to initialize object
-                        self=pairoptions(**kwargs).AssignObjectFields(self)
+                        self=pairoptions(*args).AssignObjectFields(self)
 
                         #Cast to logicals
                         listproperties=vars(self)
-                        for fieldname,fieldvalue in list(listproperties.items()):
+                        for fieldname,fieldvalue in listproperties.items():
                                 if isinstance(fieldvalue,bool) or isinstance(fieldvalue,(int,float)):
                                         setattr(self,fieldname,bool(fieldvalue))
@@ -134 +133 @@
                 return md
         # }}}
-        def marshall(self,md,fid):    # {{{
-                WriteData(fid,'data',self.VerboseToBinary(),'enum',VerboseEnum(),'format','Integer')
+        def marshall(self,prefix,md,fid):    # {{{
+                WriteData(fid,prefix,'data',self.VerboseToBinary(),'name','md.verbose','format','Integer')
         # }}}