r9044 - in /branches/cst: ./ relax_warnings.py test_suite/system_tests/model_free.py -- May 09, 2009 - 18:22

Author: bugman
Date: Sat May  9 18:22:52 2009
New Revision: 9044

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

........
  r9042 | bugman | 2009-05-09 18:10:07 +0200 (Sat, 09 May 2009) | 5 lines
  
  Bug fix for the test_opt_constr_newton_gmw_mt_S2_0_970_te_2048_Rex_0_149() 
system test.
  
  This is solely for Python 2.6.
........
  r9043 | bugman | 2009-05-09 18:22:35 +0200 (Sat, 09 May 2009) | 5 lines
  
  Python 2.6 bug fix for the RelaxWarnings format() function.
  
  The warn.formatwarning() function this replaces has a new keyword arg.
........

Modified:
    branches/cst/   (props changed)
    branches/cst/relax_warnings.py
    branches/cst/test_suite/system_tests/model_free.py

Propchange: branches/cst/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sat May  9 18:22:52 2009
@@ -1,1 +1,1 @@
-/1.3:1-9040
+/1.3:1-9043

Modified: branches/cst/relax_warnings.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/cst/relax_warnings.py?rev=9044&r1=9043&r2=9044&view=diff
==============================================================================
--- branches/cst/relax_warnings.py (original)
+++ branches/cst/relax_warnings.py Sat May  9 18:22:52 2009
@@ -38,7 +38,7 @@
 
 
 # The warning formatting function.
-def format(message, category, filename, lineno):
+def format(message, category, filename, lineno, line=None):
     """ Replacement for warnings.formatwarning to customise output format."""
 
     # Add the text 'RelaxWarning: ' to the start of the warning message.

Modified: branches/cst/test_suite/system_tests/model_free.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/cst/test_suite/system_tests/model_free.py?rev=9044&r1=9043&r2=9044&view=diff
==============================================================================
--- branches/cst/test_suite/system_tests/model_free.py (original)
+++ branches/cst/test_suite/system_tests/model_free.py Sat May  9 18:22:52 
2009
@@ -594,6 +594,9 @@
         if SYSTEM == 'Linux' and ARCH[0] == '64bit':
             f_count = 91
             g_count = 91
+            if search('^2.6', PY_VER):
+                f_count = 153
+                g_count = 153
         elif SYSTEM == 'Windows' and ARCH[0] == '32bit':
             f_count = 165
             g_count = 165