r18240 - in /branches/frame_order_testing: ./ test_suite/system_tests/pcs.py -- January 18, 2013 - 22:35

Author: bugman
Date: Fri Jan 18 22:35:50 2013
New Revision: 18240

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

........
  r18236 | bugman | 2013-01-18 21:14:02 +0100 (Fri, 18 Jan 2013) | 3 lines
  
  Python 3 fix for the Pcs.test_grace_plot system test.
........

Modified:
    branches/frame_order_testing/   (props changed)
    branches/frame_order_testing/test_suite/system_tests/pcs.py

Propchange: branches/frame_order_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jan 18 22:35:50 2013
@@ -1,1 +1,1 @@
-/trunk:1-18234
+/trunk:1-18239

Modified: branches/frame_order_testing/test_suite/system_tests/pcs.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/pcs.py?rev=18240&r1=18239&r2=18240&view=diff
==============================================================================
--- branches/frame_order_testing/test_suite/system_tests/pcs.py (original)
+++ branches/frame_order_testing/test_suite/system_tests/pcs.py Fri Jan 18 
22:35:50 2013
@@ -26,7 +26,6 @@
 # Python module imports.
 from os import sep
 from re import search
-from string import split
 from tempfile import mkdtemp
 
 # relax module imports.
@@ -79,8 +78,8 @@
         # Check the diagonal data.
         for i in range(len(lines)):
             if search('G0.S0', lines[i]):
-                point1 = split(lines[i+2])
-                point2 = split(lines[i+3])
+                point1 = lines[i+2].split()
+                point2 = lines[i+3].split()
                 self.assertAlmostEqual(float(point1[0]), -100.0)
                 self.assertAlmostEqual(float(point1[1]), -100.0)
                 self.assertAlmostEqual(float(point2[0]), 100.0)
@@ -89,8 +88,8 @@
         # Check the 15N data.
         for i in range(len(lines)):
             if search('G0.S1', lines[i]):
-                point1 = split(lines[i+2])
-                point2 = split(lines[i+3])
+                point1 = lines[i+2].split()
+                point2 = lines[i+3].split()
                 self.assertAlmostEqual(float(point1[0]), 0.917+0.1)
                 self.assertAlmostEqual(float(point1[1]), 0.917)
                 self.assertAlmostEqual(float(point1[2]), 0.1)
@@ -101,8 +100,8 @@
         # Check the 1H data.
         for i in range(len(lines)):
             if search('G0.S2', lines[i]):
-                point1 = split(lines[i+2])
-                point2 = split(lines[i+3])
+                point1 = lines[i+2].split()
+                point2 = lines[i+3].split()
                 self.assertAlmostEqual(float(point1[0]), 0.843+0.1)
                 self.assertAlmostEqual(float(point1[1]), 0.843)
                 self.assertAlmostEqual(float(point1[2]), 0.1)