mailr16188 - /branches/uf_redesign/prompt/objects.py


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by edward on May 10, 2012 - 14:42:
Author: bugman
Date: Thu May 10 14:42:20 2012
New Revision: 16188

URL: http://svn.gna.org/viewcvs/relax?rev=16188&view=rev
Log:
Fix for the renaming of the user function argument property 'size' to 'dim'.


Modified:
    branches/uf_redesign/prompt/objects.py

Modified: branches/uf_redesign/prompt/objects.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/prompt/objects.py?rev=16188&r1=16187&r2=16188&view=diff
==============================================================================
--- branches/uf_redesign/prompt/objects.py (original)
+++ branches/uf_redesign/prompt/objects.py Thu May 10 14:42:20 2012
@@ -124,7 +124,6 @@
             arg = self._kargs[i]
             py_type = arg['py_type']
             desc_short = arg['desc_short']
-            size = arg['size']
             dim = arg['dim']
             can_be_none = arg['can_be_none']
             can_be_empty = arg['can_be_empty']
@@ -136,7 +135,7 @@
             elif py_type == 'float':
                 arg_check.is_float(value, desc_short, 
can_be_none=can_be_none)
             elif py_type == 'float_array':
-                arg_check.is_float_array(value, desc_short, size=size, 
can_be_none=can_be_none)
+                arg_check.is_float_array(value, desc_short, size=dim, 
can_be_none=can_be_none)
             elif py_type == 'float_matrix':
                 arg_check.is_float_matrix(value, desc_short, dim=dim, 
can_be_none=can_be_none)
             elif py_type == 'func':
@@ -144,37 +143,37 @@
             elif py_type == 'int':
                 arg_check.is_int(value, desc_short, can_be_none=can_be_none)
             elif py_type == 'int_list':
-                arg_check.is_int(value, desc_short, size=size, 
can_be_none=can_be_none)
+                arg_check.is_int(value, desc_short, size=dim, 
can_be_none=can_be_none)
             elif py_type == 'int_or_int_list':
-                arg_check.is_int_or_int_list(value, desc_short, size=size, 
can_be_none=can_be_none, can_be_empty=can_be_empty, 
none_elements=none_elements)
+                arg_check.is_int_or_int_list(value, desc_short, size=dim, 
can_be_none=can_be_none, can_be_empty=can_be_empty, 
none_elements=none_elements)
             elif py_type == 'list':
-                arg_check.is_list(value, desc_short, size=size, 
can_be_none=can_be_none, can_be_empty=can_be_empty)
+                arg_check.is_list(value, desc_short, size=dim, 
can_be_none=can_be_none, can_be_empty=can_be_empty)
             elif py_type == 'none':
                 arg_check.is_none(value, desc_short)
             elif py_type == 'num':
                 arg_check.is_num(value, desc_short, can_be_none=can_be_none)
             elif py_type == 'num_list':
-                arg_check.is_num_list(value, desc_short, size=size, 
can_be_none=can_be_none, can_be_empty=can_be_empty)
+                arg_check.is_num_list(value, desc_short, size=dim, 
can_be_none=can_be_none, can_be_empty=can_be_empty)
             elif py_type == 'num_or_num_tuple':
-                arg_check.is_num_or_num_tuple(value, desc_short, size=size, 
can_be_none=can_be_none, can_be_empty=can_be_empty)
+                arg_check.is_num_or_num_tuple(value, desc_short, size=dim, 
can_be_none=can_be_none, can_be_empty=can_be_empty)
             elif py_type == 'num_tuple':
-                arg_check.is_num_tuple(value, desc_short, size=size, 
can_be_none=can_be_none, can_be_empty=can_be_empty)
+                arg_check.is_num_tuple(value, desc_short, size=dim, 
can_be_none=can_be_none, can_be_empty=can_be_empty)
             elif py_type == 'str':
                 arg_check.is_str(value, desc_short, can_be_none=can_be_none)
             elif py_type == 'str_list':
-                arg_check.is_str_list(value, desc_short, size=size, 
can_be_none=can_be_none, can_be_empty=can_be_empty)
+                arg_check.is_str_list(value, desc_short, size=dim, 
can_be_none=can_be_none, can_be_empty=can_be_empty)
             elif py_type == 'str_list_of_lists':
-                arg_check.is_str_list(value, desc_short, size=size, 
can_be_none=can_be_none, can_be_empty=can_be_empty, list_of_lists=True)
+                arg_check.is_str_list(value, desc_short, size=dim, 
can_be_none=can_be_none, can_be_empty=can_be_empty, list_of_lists=True)
             elif py_type == 'str_or_inst':
                 arg_check.is_str_or_inst(value, desc_short, 
can_be_none=can_be_none)
             elif py_type == 'str_or_num_or_str_num_list':
-                arg_check.is_str_or_num_or_str_num_list(value, desc_short, 
size=size, can_be_none=can_be_none, can_be_empty=can_be_empty)
+                arg_check.is_str_or_num_or_str_num_list(value, desc_short, 
size=dim, can_be_none=can_be_none, can_be_empty=can_be_empty)
             elif py_type == 'str_or_num_list':
-                arg_check.is_str_or_num_list(value, desc_short, size=size, 
can_be_none=can_be_none, can_be_empty=can_be_empty)
+                arg_check.is_str_or_num_list(value, desc_short, size=dim, 
can_be_none=can_be_none, can_be_empty=can_be_empty)
             elif py_type == 'str_or_str_list':
-                arg_check.is_str_or_str_list(value, desc_short, size=size, 
can_be_none=can_be_none, can_be_empty=can_be_empty)
+                arg_check.is_str_or_str_list(value, desc_short, size=dim, 
can_be_none=can_be_none, can_be_empty=can_be_empty)
             elif py_type == 'tuple':
-                arg_check.is_tuple(value, desc_short, size=size, 
can_be_none=can_be_none, can_be_empty=can_be_empty)
+                arg_check.is_tuple(value, desc_short, size=dim, 
can_be_none=can_be_none, can_be_empty=can_be_empty)
             else:
                 raise RelaxError("The Python object type '%s' is unknown." % 
py_type)
 




Related Messages


Powered by MHonArc, Updated Thu May 10 15:00:01 2012