Merge branch 'baagaard/fix-uniformdb-errormsg'

* baagaard/fix-uniformdb-errormsg:
  Update version info.
  Include spatial database label in error messages.
  Added UniformDB label to error mesasge.

CHANGES

@@ -1,8 +1,11 @@
-
+2017/06/19 (version 1.9.9)
 
   BUGFIX: Improved Python interface to SimpleGridDB to make it
   possible to write 1-D and 2-D files.
 
+  Improve validation error messages; some error messages were missing
+  spatial database label.
+
 2017/03/24 (version 1.9.8)
 
   Added temperature scale to Nondimensional.

configure.ac

@@ -15,7 +15,7 @@
 #
 
 AC_PREREQ(2.59)
-AC_INIT([spatialdata], [1.9.8], [baagaard@usgs.gov])
+AC_INIT([spatialdata], [1.9.9], [baagaard@usgs.gov])
 AC_CONFIG_HEADER([portinfo])
 AC_CONFIG_AUX_DIR([./aux-config])
 AC_CONFIG_MACRO_DIR([m4])

spatialdata/__init__.py

@@ -18,7 +18,7 @@
 ##
 ## @brief Python top-level SpatialData module initialization
 
-__version__ = "1.9.8"
+__version__ = "1.9.9"
 
 __all__ = ['geocoords',
            'spatialdb',

spatialdata/spatialdb/GravityField.py

@@ -102,13 +102,11 @@ def _validateParameters(self, params):
     Validate parameters.
     """
     if (len(params.gravityDir) != 3):
-      raise ValueError, \
-            "Gravity direction must be a 3 component list or tuple."
+      raise ValueError("Gravity direction must be a 3 component list or tuple.")
     try:
       dirFloat = map(float, params.gravityDir)
     except:
-        raise ValueError, \
-              "'gravityDir' must contain floating point values."
+        raise ValueError("Gravity direction must contain floating point values.")
     return
 
 

spatialdata/spatialdb/SimpleGridDB.py

@@ -104,7 +104,7 @@ def _parseQueryString(self, label):
     elif label.lower() == "linear":
       value = ModuleSimpleGridDB.LINEAR
     else:
-      raise ValueError("Unknown value for query type '%s'." % label)
+      raise ValueError("Unknown value for query type '%s' in spatial database %s." % (label, self.label))
     return value
 
 

spatialdata/spatialdb/SimpleIO.py

@@ -105,10 +105,9 @@ def _validateData(self, data):
     (numLocs, spaceDim) = data['points'].shape
     cs = data['coordsys']
     if spaceDim != cs.spaceDim():
-      raise ValueError, \
-          "Simple database space-dim (%d) does not agree with spatial "\
-          "dimension of coordinate system (%d)." % \
-          (spaceDim, cs.spaceDim())
+      raise ValueError("Simple database '%s' space-dim (%d) does not agree with spatial "\
+            "dimension of coordinate system (%d)." % \
+            (self.label, spaceDim, cs.spaceDim()))
     return
 
 

spatialdata/spatialdb/UniformDB.py

@@ -111,15 +111,14 @@ def _validateParameters(self, params):
     Validate parameters.
     """
     if len(params.values) == 0:
-      raise ValueError("Values in UniformDB not specified.")
+      raise ValueError("Values in UniformDB '%s' not specified.", self.inventory.label)
     if len(params.data) == 0:
-      raise ValueError("Data for UniformDB not specified.")
+      raise ValueError("Data for UniformDB '%s' not specified." % self.inventory.label)
     if len(params.values) != len(params.data):
-      raise ValueError, \
-            "Incompatible settings for uniform spatial database '%s'.\n"\
-            "'values' and 'data' must be lists of the same size.\n"\
-            "'values' has size of %d but 'data' has size of %d." \
-            % (self.label, len(params.values), len(params.data))
+      raise ValueError("Incompatible settings for uniform spatial database '%s'.\n"\
+        "'values' and 'data' must be lists of the same size.\n"\
+        "'values' has size of %d but 'data' has size of %d." \
+        % (self.inventory.label, len(params.values), len(params.data)))
     try:
       for x in params.data:
         if len(str(x).split("*")) > 1:
@@ -128,8 +127,7 @@ def _validateParameters(self, params):
         else:
           dataFloat = float(x)
     except:
-        raise ValueError, \
-              "'data' list must contain dimensioned or nondimensional values."
+        raise ValueError("'data' list for UniformDB '%s' must contain dimensioned or nondimensional values." % self.inventory.label)
     return