[GRASS-SVN] r58032 - grass/trunk/lib/python/pygrass/modules/interface

[svn_grass at osgeo.org]

Author: zarch
Date: 2013-10-17 12:55:46 -0700 (Thu, 17 Oct 2013)
New Revision: 58032

Modified:
   grass/trunk/lib/python/pygrass/modules/interface/parameter.py
Log:
Improve message error for parameter with multiple values

Modified: grass/trunk/lib/python/pygrass/modules/interface/parameter.py
===================================================================
--- grass/trunk/lib/python/pygrass/modules/interface/parameter.py	2013-10-17 19:01:44 UTC (rev 58031)
+++ grass/trunk/lib/python/pygrass/modules/interface/parameter.py	2013-10-17 19:55:46 UTC (rev 58032)
@@ -88,6 +88,8 @@
         return self._value
 
     def _set_value(self, value):
+        values_error = 'The Parameter <%s>, must be a python list ' \
+                       'containing one or more of the following values: %r'
         if value is None:
             self._value = value
         elif isinstance(value, list) or isinstance(value, tuple):
@@ -111,8 +113,7 @@
                 elif value in self.values:
                     self._value = value
                 else:
-                    raise ValueError('The Parameter <%s>, must be one of: %r' %
-                                     (self.name, self.values))
+                    raise ValueError(values_error % (self.name, self.values))
             else:
                 self._value = value
         elif self.type is str and isinstance(value, unicode):
@@ -120,8 +121,7 @@
                 if value in self.values:
                     self._value = value
                 else:
-                    raise ValueError('The Parameter <%s>, must be one of: %r' %
-                                     (self.name, self.values))
+                    raise ValueError(values_error % (self.name, self.values))
             else:
                 self._value = value
         else: