From 8ea0da10db63abe1ab8191ac183fe6929719188f Mon Sep 17 00:00:00 2001 From: Brad Aagaard Date: Wed, 14 Jun 2017 16:23:04 -0700 Subject: [PATCH 1/3] Added UniformDB label to error mesasge. --- spatialdata/spatialdb/UniformDB.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spatialdata/spatialdb/UniformDB.py b/spatialdata/spatialdb/UniformDB.py index c285419c..23a7b288 100644 --- a/spatialdata/spatialdb/UniformDB.py +++ b/spatialdata/spatialdb/UniformDB.py @@ -111,9 +111,9 @@ 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"\ @@ -129,7 +129,7 @@ def _validateParameters(self, params): dataFloat = float(x) except: raise ValueError, \ - "'data' list must contain dimensioned or nondimensional values." + "'data' list for UniformDB '%s' must contain dimensioned or nondimensional values." % self.inventory.label return From d1d5bbbac1619fde86ce3240735dc7fba8746818 Mon Sep 17 00:00:00 2001 From: Brad Aagaard Date: Sat, 17 Jun 2017 14:14:27 -0700 Subject: [PATCH 2/3] Include spatial database label in error messages. --- spatialdata/spatialdb/GravityField.py | 6 ++---- spatialdata/spatialdb/SimpleGridDB.py | 2 +- spatialdata/spatialdb/SimpleIO.py | 7 +++---- spatialdata/spatialdb/UniformDB.py | 14 ++++++-------- 4 files changed, 12 insertions(+), 17 deletions(-) diff --git a/spatialdata/spatialdb/GravityField.py b/spatialdata/spatialdb/GravityField.py index 4f21e12b..8520b23f 100644 --- a/spatialdata/spatialdb/GravityField.py +++ b/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 diff --git a/spatialdata/spatialdb/SimpleGridDB.py b/spatialdata/spatialdb/SimpleGridDB.py index 848519d4..744ec5f6 100644 --- a/spatialdata/spatialdb/SimpleGridDB.py +++ b/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 diff --git a/spatialdata/spatialdb/SimpleIO.py b/spatialdata/spatialdb/SimpleIO.py index a352dde9..2428d492 100644 --- a/spatialdata/spatialdb/SimpleIO.py +++ b/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 diff --git a/spatialdata/spatialdb/UniformDB.py b/spatialdata/spatialdb/UniformDB.py index 23a7b288..5ece983d 100644 --- a/spatialdata/spatialdb/UniformDB.py +++ b/spatialdata/spatialdb/UniformDB.py @@ -113,13 +113,12 @@ def _validateParameters(self, params): if len(params.values) == 0: raise ValueError("Values in UniformDB '%s' not specified.", self.inventory.label) if len(params.data) == 0: - raise ValueError("Data for UniformDB '%s' not specified. % self.inventory.label") + 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 for UniformDB '%s' must contain dimensioned or nondimensional values." % self.inventory.label + raise ValueError("'data' list for UniformDB '%s' must contain dimensioned or nondimensional values." % self.inventory.label) return From 1a47ffdc16cc31ad523bb7ee6f3c63a43eb3e0f7 Mon Sep 17 00:00:00 2001 From: Brad Aagaard Date: Mon, 19 Jun 2017 08:33:09 -0700 Subject: [PATCH 3/3] Update version info. --- CHANGES | 5 ++++- configure.ac | 2 +- spatialdata/__init__.py | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index a5345893..38d71350 100644 --- a/CHANGES +++ b/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. diff --git a/configure.ac b/configure.ac index 1c4fa8e4..64963d0b 100644 --- a/configure.ac +++ b/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]) diff --git a/spatialdata/__init__.py b/spatialdata/__init__.py index 28822d2a..3dbcee74 100644 --- a/spatialdata/__init__.py +++ b/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',