Browse Source

Improve message error for parameter with multiple values

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@58032 15284696-431f-4ddb-bdfa-cd5b030d7da7
Pietro Zambelli 11 years ago
parent
commit
8aa7f15672
1 changed files with 4 additions and 4 deletions
  1. 4 4
      lib/python/pygrass/modules/interface/parameter.py

+ 4 - 4
lib/python/pygrass/modules/interface/parameter.py

@@ -88,6 +88,8 @@ class Parameter(object):
         return self._value
         return self._value
 
 
     def _set_value(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:
         if value is None:
             self._value = value
             self._value = value
         elif isinstance(value, list) or isinstance(value, tuple):
         elif isinstance(value, list) or isinstance(value, tuple):
@@ -111,8 +113,7 @@ class Parameter(object):
                 elif value in self.values:
                 elif value in self.values:
                     self._value = value
                     self._value = value
                 else:
                 else:
-                    raise ValueError('The Parameter <%s>, must be one of: %r' %
-                                     (self.name, self.values))
+                    raise ValueError(values_error % (self.name, self.values))
             else:
             else:
                 self._value = value
                 self._value = value
         elif self.type is str and isinstance(value, unicode):
         elif self.type is str and isinstance(value, unicode):
@@ -120,8 +121,7 @@ class Parameter(object):
                 if value in self.values:
                 if value in self.values:
                     self._value = value
                     self._value = value
                 else:
                 else:
-                    raise ValueError('The Parameter <%s>, must be one of: %r' %
-                                     (self.name, self.values))
+                    raise ValueError(values_error % (self.name, self.values))
             else:
             else:
                 self._value = value
                 self._value = value
         else:
         else: