Changeset 23716 for issm/trunk-jpl/src/m/classes/plotoptions.py

Timestamp:

02/12/19 06:10:51 (6 years ago)

Author:

bdef

Message:

CHG: shifting to py3 version of python interface (py2 compatible)

File:

• issm/trunk-jpl/src/m/classes/plotoptions.py (modified) (7 diffs)

issm/trunk-jpl/src/m/classes/plotoptions.py

@@ -23 +23 @@
                 if self.list:
                         s+="    list: (%ix%i)\n" % (len(self.list),2)
-                        for item in self.list.iteritems():
+                        for item in list(self.list.items()):
                                 #s+="   options of plot number %i\n" % item
-                                if   isinstance(item[1],(str,unicode)):
+                                if   isinstance(item[1],str):
                                         s+="    field: %-10s value: '%s'\n" % (item[0],item[1])
-                                elif isinstance(item[1],(bool,int,long,float)):
+                                elif isinstance(item[1],(bool,int,float)):
                                         s+="    field: %-10s value: '%g'\n" % (item[0],item[1])
                                 else:
@@ -42 +42 @@
                 #go through args and build list (like pairoptions)
                 rawoptions=pairoptions.pairoptions(*arg)
-                numoptions=len(arg)/2
+                numoptions=int(len(arg)/2)
                 rawlist=[] # cannot be a dict since they do not support duplicate keys
 
-                for i in xrange(numoptions):
-                        if isinstance(arg[2*i],(str,unicode)):
+                for i in range(numoptions):
+                        if isinstance(arg[2*i],str):
                                 rawlist.append([arg[2*i],arg[2*i+1]])
                         else:
                                 #option is not a string, ignore it
-                                print "WARNING: option number %d is not a string and will be ignored." % (i+1)
+                                print(("WARNING: option number %d is not a string and will be ignored." % (i+1)))
 
                 #get figure number
@@ -68 +68 @@
                 #initialize self.list (will need a list of dict's (or nested dict) for numberofplots>1)
                 #self.list=defaultdict(dict)
-                for i in xrange(numberofplots):
+                for i in range(numberofplots):
                         self.list[i]=pairoptions.pairoptions()
 
                 #process plot options
-                for i in xrange(len(rawlist)):
+                for i in range(len(rawlist)):
 
                         #if alloptions flag is on, apply to all plots
                         if (allflag and 'data' not in rawlist[i][0] and '#' not in rawlist[i][0]):
 
-                                for j in xrange(numberofplots):
+                                for j in range(numberofplots):
                                         self.list[j].addfield(rawlist[i][0],rawlist[i][1])
 
@@ -88 +88 @@
 
                                 #loop over plotnums
-                                for k in xrange(len(plotnums)):
+                                for k in range(len(plotnums)):
                                         plotnum=plotnums[k]
 
@@ -96 +96 @@
                                         # '#all'
                                         elif 'all' in plotnum:
-                                                for j in xrange(numberofplots):
+                                                for j in range(numberofplots):
                                                         self.list[j].addfield(field,rawlist[i][1])
 
@@ -105 +105 @@
                                                 if False in [x.isdigit() for x in nums]:
                                                         raise ValueError('error: in option i-j both i and j must be integers')
-                                                for j in xrange(int(nums[0])-1,int(nums[1])):
+                                                for j in range(int(nums[0])-1,int(nums[1])):
                                                         self.list[j].addfield(field,rawlist[i][1])
 
@@ -125 +125 @@
                                                 j=j+1
                                 if j+1>numberofplots:
-                                        print "WARNING: too many instances of '%s' in options" % rawlist[i][0]
+                                        print(("WARNING: too many instances of '%s' in options" % rawlist[i][0]))
         #}}}