r16138 - /branches/uf_redesign/gui/uf_objects.py -- May 09, 2012 - 10:48

Author: bugman
Date: Wed May  9 10:48:25 2012
New Revision: 16138

URL: http://svn.gna.org/viewcvs/relax?rev=16138&view=rev
Log:
Fix for the Uf_page.on_display() method for updating ComboBox data.

The check of the data returned by the iterator can now handle all data types.


Modified:
    branches/uf_redesign/gui/uf_objects.py

Modified: branches/uf_redesign/gui/uf_objects.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/gui/uf_objects.py?rev=16138&r1=16137&r2=16138&view=diff
==============================================================================
--- branches/uf_redesign/gui/uf_objects.py (original)
+++ branches/uf_redesign/gui/uf_objects.py Wed May  9 10:48:25 2012
@@ -31,6 +31,7 @@
 from wx.lib import scrolledpanel
 
 # relax module imports.
+import arg_check
 from prompt.base_class import _strip_lead
 from relax_errors import RelaxError
 from user_functions.data import Uf_info; uf_info = Uf_info()
@@ -419,7 +420,7 @@
             choices = []
             data = []
             for vals in iterator():
-                if not isinstance(vals, str) and len(vals) == 2:
+                if arg_check.is_tuple(vals, size=2, raise_error=False):
                     choices.append(vals[0])
                     data.append(vals[1])
                 else: