Changeset 26856

Timestamp:

02/07/22 04:43:46 (3 years ago)

Author:

bdef

Message:

BUG: syntax fixes

Location:

issm/trunk-jpl/src/m

Files:

• consistency/checkfield.py (modified) (1 diff)
• miscellaneous/fielddisplay.py (modified) (2 diffs)

issm/trunk-jpl/src/m/consistency/checkfield.py

@@ -153 +153 @@
                 md = md.checkmessage(options.getfieldvalue('message', "field '{}' value should be '{}'".format(fieldname, fieldvalues[0])))
             elif len(fieldvalues) == 2:
-                md = md.checkmessage(options.getfieldvalue('message', "field '{}' values should be '{}' '{}' or '{}'".format(fieldname, fieldvalues[0], fieldvalues[1])))
+                md = md.checkmessage(options.getfieldvalue('message', "field '{}' values should be '{}' or '{}'".format(fieldname, fieldvalues[0], fieldvalues[1])))
             else:
                 md = md.checkmessage(options.getfieldvalue('message', "field '{}' should have values in {}".format(fieldname, fieldvalues)))

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

@@ -110 +110 @@
 
 
-def displayunit(offset, name, characterization, comment): #{{{
+def displayunit(offset, name, characterization, comment):  #{{{
     #take care of name
     if len(name) > 23:
@@ -116 +116 @@
 
     #take care of characterization
-    if m.strcmp(characterization, "''") or m.strcmp(characterization, '""') or m.strcmpi(characterization, 'nan'):
+    if characterization in ["''", '""', 'nan', np.nan, 'NaN', "[0x1]"]:
         characterization = "N/A"