Author: bugman
Date: Fri Jun 7 15:48:57 2013
New Revision: 19948
URL: http://svn.gna.org/viewcvs/relax?rev=19948&view=rev
Log:
Merged revisions 19947 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r19947 | bugman | 2013-06-07 15:46:37 +0200 (Fri, 07 Jun 2013) | 9 lines
Bug fix for the Sequence GUI input element.
This complete the removal of bug #20873 (https://gna.org/bugs/?20873).
The problem was that the gui_to_str() function was not failing to convert
the string into a string
list, so the list was deemed as a single string. Now the first character
of '[' or '(' for lists or
tuples are now searched for instead of relying on the conversion to trigger
an error.
........
Modified:
branches/relax_disp/ (props changed)
branches/relax_disp/gui/input_elements/sequence.py
Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jun 7 15:48:57 2013
@@ -1,1 +1,1 @@
-/trunk:1-19941
+/trunk:1-19947
Modified: branches/relax_disp/gui/input_elements/sequence.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/gui/input_elements/sequence.py?rev=19948&r1=19947&r2=19948&view=diff
==============================================================================
--- branches/relax_disp/gui/input_elements/sequence.py (original)
+++ branches/relax_disp/gui/input_elements/sequence.py Fri Jun 7 15:48:57
2013
@@ -263,7 +263,9 @@
if isinstance(value, int):
value_set = True
elif self.value_type == 'str':
- if isinstance(value, str):
+ if self.seq_type == 'list' and value[0] != '[':
+ value_set = True
+ elif self.seq_type == 'tuple' and value[0] != '(':
value_set = True
except:
pass
r19948 - in /branches/relax_disp: ./ gui/input_elements/sequence.py