fix #1212 - Update spyder 2.3.3 to 2.3.4

CMake/cdat_modules/spyder_pkg.cmake

@@ -1,7 +1,9 @@
-set(SPYDER_VERSION 2.3.3)
+set(SPYDER_MAJOR_SRC 2)
+set(SPYDER_MINOR_SRC 3)
+set(SPYDER_PATCH_SRC 4)
 set(SPYDER_URL ${LLNL_URL})
-set(SPYDER_GZ spyder-${SPYDER_VERSION}.zip)
-set(SPYDER_SOURCE ${SPYDER_URL}/${SPYDER_GZ})
-set(SPYDER_MD5 8442bbb0a74475ed3307d6e983ecd700)
+set(SPYDER_ZIP spyder-${SPYDER_MAJOR_SRC}.${SPYDER_MINOR_SRC}.${SPYDER_PATCH_SRC}.zip)
+set(SPYDER_SOURCE ${SPYDER_URL}/${SPYDER_ZIP})
+set(SPYDER_MD5 e751f19b0c872cdfad6b1e3a69250f20)
 
 add_cdat_package_dependent(spyder "" "" OFF "CDAT_BUILD_GUI" OFF)

Packages/vcs/Lib/VCS_validation_functions.py

@@ -349,15 +349,55 @@ def checkIntFloat(self,name,value):
 ## return value
 ## else:
 ## raise ValueError, 'The '+name+' attribute must be either an integer or a float value.'
-
+
+def checkBoolean(self, name, value):
+ """Strictly checks for True/False only. See also: checkFuzzyBoolean."""
+ checkName(self, name, value)
+ if isinstance(value, bool):
+ return value
+ checkedRaise(self, value, ValueError,
+ "The '%s' attribute must be either True of False, got %s."
+ %(name, value))
+
+fuzzy_boolean_true_strings = ['on', '1', 'true', 'y', 'yes']
+fuzzy_boolean_false_strings = ['off', '0', 'false', 'n', 'no']
+fuzzy_boolean_valid_value_string = "True/False, 'True'/'False', 1/0, " \
+ "'1'/'0', 'y'/'n', 'yes'/'no', 'on'/'off'"
+def checkFuzzyBoolean(self, name, value):
+ """Checks if a value can be interpreted as true or false.
+
+ Accepted values are %s.
+ """%fuzzy_boolean_valid_value_string
+ checkName(self, name, value)
+ if isinstance(value, str):
+ if value.lower() in fuzzy_boolean_true_strings:
+ return True
+ elif value.lower() in fuzzy_boolean_false_strings:
+ return False
+ elif isinstance(value, int):
+ if value == 1:
+ return True
+ elif value == 0:
+ return False
+ elif isinstance(value, bool):
+ return value
+ checkedRaise(self, value, ValueError,
+ "The '%s' attribute must be one of: %s. Got %s."
+ %(name, fuzzy_boolean_valid_value_string, value))
+
 def checkTrueFalse(self,name,value):
+ """Strictly checks for True/False or 1/0 only. See also: checkFuzzyBoolean."""
  checkName(self,name,value)
  if value in [True,False,1,0]:
  return value==True
  else:
  checkedRaise(self,value, ValueError, "The '%s' attribute must be True or False" % name)
 
 def checkOnOff(self,name,value,return_string=0):
+ """Checks for some true/false inputs and returns various true/false outputs.
+
+ See also: checkFuzzyBoolean.
+ """
  checkName(self,name,value)
  if isinstance(value,unicode):
  value = str(value)
@@ -391,6 +431,10 @@ def checkOnOff(self,name,value,return_string=0):
  return value
 
 def checkYesNo(self,name,value):
+ """Checks various true/false inputs and returns 'y'/'n'.
+
+ See also: checkFuzzyBoolean.
+ """
  checkName(self,name,value)
  if isinstance(value,unicode):
  value = str(value)