Changeset 13098

Timestamp:

08/20/12 14:13:18 (13 years ago)

Author:

jschierm

Message:

CHG: Broaden isinstance criteria for python to consistently include unicode and long.

Location:

issm/trunk-jpl/src/m

Files:

• classes/pairoptions.py (modified) (7 diffs)
• classes/solver.py (modified) (1 diff)
• classes/verbose.py (modified) (3 diffs)
• geometry/FlagElements.py (modified) (1 diff)
• miscellaneous/fielddisplay.py (modified) (3 diffs)
• solve/WriteData.py (modified) (1 diff)
• solve/loadresultsfromdisk.py (modified) (1 diff)

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

@@ -36 +36 @@
                 #go through arg and build list of objects
                 for i in xrange(numoptions):
-                        if isinstance(arg[2*i],str):
+                        if isinstance(arg[2*i],(str,unicode)):
                                 self.list[arg[2*i]] = arg[2*i+1];
                         else:
@@ -45 +45 @@
         def addfield(self,field,value):    # {{{
                 """ADDFIELD - add a field to an options list"""
-                if isinstance(field,str):
+                if isinstance(field,(str,unicode)):
                         if field in self.list:
                                 print "WARNING: field '%s' with value=%s exists and will be overwritten with value=%s." % (field,str(self.list[field]),str(value))
@@ -53 +53 @@
         def addfielddefault(self,field,value):    # {{{
                 """ADDFIELDDEFAULT - add a field to an options list if it does not exist"""
-                if isinstance(field,str):
+                if isinstance(field,(str,unicode)):
                         if field not in self.list:
                                 self.list[field] = value
@@ -100 +100 @@
                         s+="   list: (%ix%i)\n\n" % (len(self.list),2)
                         for item in self.list.iteritems():
-                                if   isinstance(item[1],str):
+                                if   isinstance(item[1],(str,unicode)):
                                         s+="     field: %-10s value: '%s'\n" % (item[0],item[1])
                                 elif isinstance(item[1],(bool,int,long,float)):
@@ -117 +117 @@
                 if field == None or field == '':
                         raise ValueError('exist error message: bad usage');
-                if not isinstance(field,str):
+                if not isinstance(field,(str,unicode)):
                         raise TypeError("exist error message: field '%s' should be a string." % str(field));
 
@@ -157 +157 @@
                 if field == None or field == '':
                         raise ValueError('getfieldvalue error message: bad usage');
-                if not isinstance(field,str):
+                if not isinstance(field,(str,unicode)):
                         raise TypeError("getfieldvalue error message: field '%s' should be a string." % str(field));
 
@@ -204 +204 @@
 
                         #Write option value
-                        if   isinstance(value,str):
+                        if   isinstance(value,(str,unicode)):
                                 WriteData(fid,'enum',(firstindex-1)+2*i+2,'data',value,'format','String')
                         elif isinstance(value,(bool,int,long,float)):

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

@@ -95 +95 @@
                                 else:
                                         #option with value. value can be string or scalar
-                                        if   isinstance(optionvalue,(bool,int,float)):
+                                        if   isinstance(optionvalue,(bool,int,long,float)):
                                                 fid.write("-%s %g\n" % (optionname,optionvalue))
-                                        elif isinstance(optionvalue,str):
+                                        elif isinstance(optionvalue,(str,unicode)):
                                                 fid.write("-%s %s\n" % (optionname,optionvalue))
                                         else:

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

@@ -44 +44 @@
                 elif len(args) == 1:
                         binary=args[0]
-                        if   isinstance(binary,str):
+                        if   isinstance(binary,(str,unicode)):
                                 if strcmpi(binary,'all'):
                                         binary=2**11-1    #all ones
@@ -52 +52 @@
                                         binary=int(binary,2)
                                         self.BinaryToVerbose(binary)
-                        elif isinstance(binary,(int,float)):
+                        elif isinstance(binary,(int,long,float)):
                                 self.BinaryToVerbose(int(binary))
 
@@ -62 +62 @@
                         listproperties=vars(self)
                         for [fieldname,fieldvalue] in listproperties.iteritems():
-                                if isinstance(fieldvalue,bool) or isinstance(fieldvalue,(int,float)):
+                                if isinstance(fieldvalue,bool) or isinstance(fieldvalue,(int,long,float)):
                                         setattr(self,fieldname,bool(fieldvalue))
                                 else:

issm/trunk-jpl/src/m/geometry/FlagElements.py

@@ -22 +22 @@
         """
 
-        if   isinstance(region,str):
+        if   isinstance(region,(str,unicode)):
                 if   not region:
                         flag=numpy.zeros(md.mesh.numberofelements,'bool')

issm/trunk-jpl/src/m/miscellaneous/fielddisplay.py

@@ -19 +19 @@
 
         #string
-        if isinstance(field,str):
+        if isinstance(field,(str,unicode)):
                 if len(field)>30:
                         string=displayunit(offset,name,"not displayed",comment)
@@ -26 +26 @@
 
         #numeric
-        elif isinstance(field, int):
+        elif isinstance(field, (int,long)):
                 string=displayunit(offset,name,"%i" % (field),comment) 
 
@@ -88 +88 @@
                 string="%s%-23s: %-15s" % (offset,name,characterization)
         else:
-                if isinstance(comment,str):
+                if isinstance(comment,(str,unicode)):
                         string="%s%-23s: %-15s -- %s" % (offset,name,characterization,comment)
                 elif isinstance(comment,list):

issm/trunk-jpl/src/m/solve/WriteData.py

@@ -132 +132 @@
         elif strcmpi(format,'IntMat'):    # {{{
 
-                if isinstance(data,int):
+                if isinstance(data,(int,long)):
                         data=numpy.array([data])
                 if len(data.shape) == 1:

issm/trunk-jpl/src/m/solve/loadresultsfromdisk.py

@@ -53 +53 @@
         else:
 
-                if not isinstance(md.private.solution,str):
+                if not isinstance(md.private.solution,(str,unicode)):
                         [md.private.solution]=EnumToString(md.private.solution)
                 md=postqmu(md)