r14105 - in /branches/gui_testing: ./ relax_warnings.py -- August 04, 2011 - 11:12

Author: bugman
Date: Thu Aug  4 11:12:10 2011
New Revision: 14105

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

........
  r14103 | bugman | 2011-08-04 11:08:58 +0200 (Thu, 04 Aug 2011) | 6 lines
  
  Fix for the RelaxWarning system on Mac OS X, the base class __str__ method 
now returns a simple string.
  
  On a Mac, the warning message text was in unicode whereas the __str__() 
method must return a standard
  string.  So now __str__() is using the str() method to convert.
........

Modified:
    branches/gui_testing/   (props changed)
    branches/gui_testing/relax_warnings.py

Propchange: branches/gui_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Aug  4 11:12:10 2011
@@ -1,1 +1,1 @@
-/1.3:1-14071
+/1.3:1-14104

Modified: branches/gui_testing/relax_warnings.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/relax_warnings.py?rev=14105&r1=14104&r2=14105&view=diff
==============================================================================
--- branches/gui_testing/relax_warnings.py (original)
+++ branches/gui_testing/relax_warnings.py Thu Aug  4 11:12:10 2011
@@ -79,7 +79,7 @@
 
 class BaseWarning(Warning):
     def __str__(self):
-        return self.text
+        return str(self.text)
 
 
 # Standard warnings.