2 new revisions:
Revision: fdee5360fac4
Branch: default
Author: Pekka Klärck
Date: Tue Sep 11 23:40:55 2012
Log: variableassigner.py: cleaned up reporting error assigning
variables
http://code.google.com/p/robotframework/source/detail?r=fdee5360fac4
Revision: ec023a536c83
Branch: default
Author: Pekka Klärck
Date: Tue Sep 11 23:46:31 2012
Log: merge
http://code.google.com/p/robotframework/source/detail?r=ec023a536c83
==============================================================================
Revision: fdee5360fac4
Branch: default
Author: Pekka Klärck
Date: Tue Sep 11 23:40:55 2012
Log: variableassigner.py: cleaned up reporting error assigning
variables
http://code.google.com/p/robotframework/source/detail?r=fdee5360fac4
Modified:
/src/robot/variables/variableassigner.py
=======================================
--- /src/robot/variables/variableassigner.py Tue Mar 13 04:59:20 2012
+++ /src/robot/variables/variableassigner.py Tue Sep 11 23:40:55 2012
@@ -155,9 +155,11 @@
return zip(scalars, ret) + [(list_, ret[len(scalars):])]
def _raise_expected_list(self, ret):
- raise DataError('Cannot assign return values: Expected list-like '
- 'object, got %s instead.' % type(ret).__name__)
+ self._raise('Expected list-like object, got %s instead.'
+ % type(ret).__name__)
def _raise_too_few_arguments(self, ret):
- raise DataError('Cannot assign return values: Need more values
than %d.'
- % len(ret))
+ self._raise('Need more values than %d.' % len(ret))
+
+ def _raise(self, error):
+ raise DataError('Cannot assign return values: %s' % error)
==============================================================================
Revision: ec023a536c83
Branch: default
Author: Pekka Klärck
Date: Tue Sep 11 23:46:31 2012
Log: merge
http://code.google.com/p/robotframework/source/detail?r=ec023a536c83
