r23570 - in /branches/frame_order_cleanup: ./ lib/arg_check.py -- May 28, 2014 - 20:24

Author: bugman
Date: Wed May 28 20:24:48 2014
New Revision: 23570

URL: http://svn.gna.org/viewcvs/relax?rev=23570&view=rev
Log:
Merged revisions 23568 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r23568 | bugman | 2014-05-28 19:21:59 +0200 (Wed, 28 May 2014) | 6 lines
  
  Bug fix for the lib.arg_check.is_float_object() function.
  
  The dim argument can sometimes be an integer rather than a tuple, but this 
was not handled by the
  function.  Now integer dim arguments are pre-converted to lists before 
performing all the checks.
........

Modified:
    branches/frame_order_cleanup/   (props changed)
    branches/frame_order_cleanup/lib/arg_check.py

Propchange: branches/frame_order_cleanup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed May 28 20:24:48 2014
@@ -1 +1 @@
-/trunk:1-23562
+/trunk:1-23569

Modified: branches/frame_order_cleanup/lib/arg_check.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/lib/arg_check.py?rev=23570&r1=23569&r2=23570&view=diff
==============================================================================
--- branches/frame_order_cleanup/lib/arg_check.py       (original)
+++ branches/frame_order_cleanup/lib/arg_check.py       Wed May 28 20:24:48 
2014
@@ -245,6 +245,8 @@
 
     # Init.
     fail = False
+    if isinstance(dim, int):
+        dim = [dim]
 
     # An argument of None is allowed.
     if can_be_none and arg == None: