r13911 - in /branches/gui_testing: ./ gui/user_functions/value.py specific_fns/setup.py -- July 26, 2011 - 22:26

Author: bugman
Date: Tue Jul 26 22:26:20 2011
New Revision: 13911

URL: http://svn.gna.org/viewcvs/relax?rev=13911&view=rev
Log:
Reverted r13910 as it contained more than just the svnmerge results.

The command used was:
svn merge -r13910:13909 .


Modified:
    branches/gui_testing/   (props changed)
    branches/gui_testing/gui/user_functions/value.py
    branches/gui_testing/specific_fns/setup.py

Propchange: branches/gui_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jul 26 22:26:20 2011
@@ -1,1 +1,1 @@
-/1.3:1-13909
+/1.3:1-13906

Modified: branches/gui_testing/gui/user_functions/value.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/user_functions/value.py?rev=13911&r1=13910&r2=13911&view=diff
==============================================================================
--- branches/gui_testing/gui/user_functions/value.py (original)
+++ branches/gui_testing/gui/user_functions/value.py Tue Jul 26 22:26:20 2011
@@ -126,7 +126,6 @@
 
         # The value (converted to the correct type).
         val_str = gui_to_str(self.val.GetValue())
-        print `val_str`
         val_type = self.data_type(param)
         try:
             val = apply(val_type, val_str)

Modified: branches/gui_testing/specific_fns/setup.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/specific_fns/setup.py?rev=13911&r1=13910&r2=13911&view=diff
==============================================================================
--- branches/gui_testing/specific_fns/setup.py (original)
+++ branches/gui_testing/specific_fns/setup.py Tue Jul 26 22:26:20 2011
@@ -87,10 +87,6 @@
         if eqi == 'data_names':
             function = inst.data_names
 
-        # The parameter type function.
-        if eqi == 'data_type':
-            function = inst.data_type
-
         # Default parameter value returning function.
         if eqi == 'default_value':
             function = inst.default_value