Author: bugman Date: Wed Sep 4 10:01:43 2013 New Revision: 20789 URL: http://svn.gna.org/viewcvs/relax?rev=20789&view=rev Log: Merged revisions 20788 via svnmerge from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk ........ r20788 | bugman | 2013-09-04 10:01:07 +0200 (Wed, 04 Sep 2013) | 7 lines Python 3 fixes for all of the unicode strings in relax. Instead of using the u"xyz" notation, now unicode("xyz") is being used. This works as the relax compat module sets the builtin unicode() function to str() for Python 3, as all strings in Python 3 are unicode and hence both the Python 2 u"xyz" and unicode() code are undefined in Python 3. ........ Modified: branches/relax_disp/ (props changed) branches/relax_disp/gui/analyses/auto_model_free.py branches/relax_disp/gui/analyses/auto_r1.py branches/relax_disp/gui/analyses/auto_r2.py branches/relax_disp/gui/analyses/wizard.py branches/relax_disp/gui/components/relax_data.py branches/relax_disp/gui/string_conv.py branches/relax_disp/user_functions/model_free.py [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/relax_disp/gui/analyses/auto_model_free.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/gui/analyses/auto_model_free.py?rev=20789&r1=20788&r2=20789&view=diff Modified: branches/relax_disp/gui/analyses/auto_r1.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/gui/analyses/auto_r1.py?rev=20789&r1=20788&r2=20789&view=diff Modified: branches/relax_disp/gui/analyses/auto_r2.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/gui/analyses/auto_r2.py?rev=20789&r1=20788&r2=20789&view=diff Modified: branches/relax_disp/gui/analyses/wizard.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/gui/analyses/wizard.py?rev=20789&r1=20788&r2=20789&view=diff Modified: branches/relax_disp/gui/components/relax_data.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/gui/components/relax_data.py?rev=20789&r1=20788&r2=20789&view=diff Modified: branches/relax_disp/gui/string_conv.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/gui/string_conv.py?rev=20789&r1=20788&r2=20789&view=diff Modified: branches/relax_disp/user_functions/model_free.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/user_functions/model_free.py?rev=20789&r1=20788&r2=20789&view=diff