[cig-commits] r9154 - cs/spatialdata-0.1/trunk/spatialdata/spatialdb

[brad at geodynamics.org]

Author: brad
Date: 2008-01-28 16:38:45 -0800 (Mon, 28 Jan 2008)
New Revision: 9154

Modified:
   cs/spatialdata-0.1/trunk/spatialdata/spatialdb/UniformDB.py
Log:
Fixed bug where _validate() method clashed with pythia method. Changed name to _validateParameters().

Modified: cs/spatialdata-0.1/trunk/spatialdata/spatialdb/UniformDB.py
===================================================================
--- cs/spatialdata-0.1/trunk/spatialdata/spatialdb/UniformDB.py	2008-01-28 23:35:39 UTC (rev 9153)
+++ cs/spatialdata-0.1/trunk/spatialdata/spatialdb/UniformDB.py	2008-01-29 00:38:45 UTC (rev 9154)
@@ -80,13 +80,13 @@
     Set members based on inventory.
     """
     SpatialDB._configure(self)
-    self._validate(self.inventory)
+    self._validateParameters(self.inventory)
     self.values = self.inventory.values
     self.data = map(float, self.inventory.data)
     return
 
 
-  def _validate(self, data):
+  def _validateParameters(self, data):
     """
     Validate parameters.
     """
@@ -95,7 +95,7 @@
             "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(self.values), len(self.data))
+            % (self.label, len(data.values), len(data.data))
     try:
       dataFloat = map(float, data.data)
     except: