mailr17690 - /trunk/test_suite/system_tests/peak_lists.py


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by edward on October 03, 2012 - 00:09:
Author: bugman
Date: Wed Oct  3 00:09:30 2012
New Revision: 17690

URL: http://svn.gna.org/viewcvs/relax?rev=17690&view=rev
Log:
The Python 3 dictionary values() method no longer returns a list, so a list() 
call is needed.


Modified:
    trunk/test_suite/system_tests/peak_lists.py

Modified: trunk/test_suite/system_tests/peak_lists.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/peak_lists.py?rev=17690&r1=17689&r2=17690&view=diff
==============================================================================
--- trunk/test_suite/system_tests/peak_lists.py (original)
+++ trunk/test_suite/system_tests/peak_lists.py Wed Oct  3 00:09:30 2012
@@ -151,8 +151,8 @@
         self.interpreter.spectrum.read_intensities(file="cNTnC.xpk", 
dir=status.install_path + 
sep+'test_suite'+sep+'shared_data'+sep+'peak_lists', spectrum_id='test', 
int_method='height')
 
         # Test the data.
-        self.assertEqual(cdp.mol[0].res[0].spin[0].intensities.values()[0], 
-0.1694)
-        self.assertEqual(cdp.mol[0].res[1].spin[0].intensities.values()[0], 
-0.1142)
+        
self.assertEqual(list(cdp.mol[0].res[0].spin[0].intensities.values())[0], 
-0.1694)
+        
self.assertEqual(list(cdp.mol[0].res[1].spin[0].intensities.values())[0], 
-0.1142)
 
 
     def test_read_peak_list_sparky(self):
@@ -169,10 +169,10 @@
         self.interpreter.spectrum.read_intensities(file="ref_ave.list", 
dir=status.install_path + 
sep+'test_suite'+sep+'shared_data'+sep+'peak_lists', spectrum_id='test', 
int_method='height')
 
         # Test the data.
-        self.assertEqual(cdp.mol[0].res[0].spin[0].intensities.values()[0], 
6262)
-        self.assertEqual(cdp.mol[0].res[1].spin[0].intensities.values()[0], 
148614)
-        self.assertEqual(cdp.mol[0].res[2].spin[0].intensities.values()[0], 
166842)
-        self.assertEqual(cdp.mol[0].res[3].spin[0].intensities.values()[0], 
128690)
+        
self.assertEqual(list(cdp.mol[0].res[0].spin[0].intensities.values())[0], 
6262)
+        
self.assertEqual(list(cdp.mol[0].res[1].spin[0].intensities.values())[0], 
148614)
+        
self.assertEqual(list(cdp.mol[0].res[2].spin[0].intensities.values())[0], 
166842)
+        
self.assertEqual(list(cdp.mol[0].res[3].spin[0].intensities.values())[0], 
128690)
 
 
     def test_read_peak_list_xeasy(self):
@@ -206,25 +206,25 @@
         
self.interpreter.spectrum.read_intensities(file="xeasy_r1_20ms.text", 
dir=status.install_path + 
sep+'test_suite'+sep+'shared_data'+sep+'peak_lists', spectrum_id='test', 
int_method='height')
 
         # Test the data.
-        self.assertEqual(cdp.mol[0].res[ 0].spin[0].intensities.values()[0], 
9.714e+03)
-        self.assertEqual(cdp.mol[0].res[ 1].spin[0].intensities.values()[0], 
7.919e+03)
-        self.assertEqual(cdp.mol[0].res[ 2].spin[0].intensities.values()[0], 
1.356e+04)
-        self.assertEqual(cdp.mol[0].res[ 3].spin[0].intensities.values()[0], 
9.884e+03)
-        self.assertEqual(cdp.mol[0].res[ 4].spin[0].intensities.values()[0], 
2.041e+04)
-        self.assertEqual(cdp.mol[0].res[ 5].spin[0].intensities.values()[0], 
9.305e+03)
-        self.assertEqual(cdp.mol[0].res[ 6].spin[0].intensities.values()[0], 
3.154e+04)
-        self.assertEqual(cdp.mol[0].res[ 7].spin[0].intensities.values()[0], 
9.180e+03)
-        self.assertEqual(cdp.mol[0].res[ 9].spin[0].intensities.values()[0], 
1.104e+04)
-        self.assertEqual(cdp.mol[0].res[10].spin[0].intensities.values()[0], 
7.680e+03)
-        self.assertEqual(cdp.mol[0].res[11].spin[0].intensities.values()[0], 
5.206e+03)
-        self.assertEqual(cdp.mol[0].res[12].spin[0].intensities.values()[0], 
2.863e+04)
-        self.assertEqual(cdp.mol[0].res[14].spin[0].intensities.values()[0], 
9.271e+03)
-        self.assertEqual(cdp.mol[0].res[15].spin[0].intensities.values()[0], 
7.919e+03)
-        self.assertEqual(cdp.mol[0].res[16].spin[0].intensities.values()[0], 
9.962e+03)
-        self.assertEqual(cdp.mol[0].res[17].spin[0].intensities.values()[0], 
1.260e+04)
-        self.assertEqual(cdp.mol[0].res[18].spin[0].intensities.values()[0], 
1.545e+04)
-        self.assertEqual(cdp.mol[0].res[19].spin[0].intensities.values()[0], 
1.963e+04)
-        self.assertEqual(cdp.mol[0].res[20].spin[0].intensities.values()[0], 
1.918e+04)
+        self.assertEqual(list(cdp.mol[0].res[ 
0].spin[0].intensities.values())[0], 9.714e+03)
+        self.assertEqual(list(cdp.mol[0].res[ 
1].spin[0].intensities.values())[0], 7.919e+03)
+        self.assertEqual(list(cdp.mol[0].res[ 
2].spin[0].intensities.values())[0], 1.356e+04)
+        self.assertEqual(list(cdp.mol[0].res[ 
3].spin[0].intensities.values())[0], 9.884e+03)
+        self.assertEqual(list(cdp.mol[0].res[ 
4].spin[0].intensities.values())[0], 2.041e+04)
+        self.assertEqual(list(cdp.mol[0].res[ 
5].spin[0].intensities.values())[0], 9.305e+03)
+        self.assertEqual(list(cdp.mol[0].res[ 
6].spin[0].intensities.values())[0], 3.154e+04)
+        self.assertEqual(list(cdp.mol[0].res[ 
7].spin[0].intensities.values())[0], 9.180e+03)
+        self.assertEqual(list(cdp.mol[0].res[ 
9].spin[0].intensities.values())[0], 1.104e+04)
+        
self.assertEqual(list(cdp.mol[0].res[10].spin[0].intensities.values())[0], 
7.680e+03)
+        
self.assertEqual(list(cdp.mol[0].res[11].spin[0].intensities.values())[0], 
5.206e+03)
+        
self.assertEqual(list(cdp.mol[0].res[12].spin[0].intensities.values())[0], 
2.863e+04)
+        
self.assertEqual(list(cdp.mol[0].res[14].spin[0].intensities.values())[0], 
9.271e+03)
+        
self.assertEqual(list(cdp.mol[0].res[15].spin[0].intensities.values())[0], 
7.919e+03)
+        
self.assertEqual(list(cdp.mol[0].res[16].spin[0].intensities.values())[0], 
9.962e+03)
+        
self.assertEqual(list(cdp.mol[0].res[17].spin[0].intensities.values())[0], 
1.260e+04)
+        
self.assertEqual(list(cdp.mol[0].res[18].spin[0].intensities.values())[0], 
1.545e+04)
+        
self.assertEqual(list(cdp.mol[0].res[19].spin[0].intensities.values())[0], 
1.963e+04)
+        
self.assertEqual(list(cdp.mol[0].res[20].spin[0].intensities.values())[0], 
1.918e+04)
 
 
     def test_read_peak_list_xeasy_2(self):
@@ -238,7 +238,7 @@
         
self.interpreter.spectrum.read_intensities(file="xeasy_r1_20ms.text", 
dir=status.install_path + 
sep+'test_suite'+sep+'shared_data'+sep+'peak_lists', spectrum_id='test', 
heteronuc='NE1', proton='HE1', int_method='height')
 
         # Test the data.
-        self.assertEqual(cdp.mol[0].res[0].spin[0].intensities.values()[0], 
1.532e+04)
+        
self.assertEqual(list(cdp.mol[0].res[0].spin[0].intensities.values())[0], 
1.532e+04)
 
 
     def test_read_peak_list_xeasy_3(self):
@@ -252,7 +252,7 @@
         
self.interpreter.spectrum.read_intensities(file="xeasy_r1_20ms.text", 
dir=status.install_path + 
sep+'test_suite'+sep+'shared_data'+sep+'peak_lists', spectrum_id='test', 
heteronuc='C', int_method='height')
 
         # Test the data.
-        self.assertEqual(cdp.mol[0].res[0].spin[0].intensities.values()[0], 
6.877e+03)
+        
self.assertEqual(list(cdp.mol[0].res[0].spin[0].intensities.values())[0], 
6.877e+03)
 
 
     def test_read_peak_list_xeasy_4(self):
@@ -266,4 +266,4 @@
         
self.interpreter.spectrum.read_intensities(file="xeasy_r1_20ms.text", 
dir=status.install_path + 
sep+'test_suite'+sep+'shared_data'+sep+'peak_lists', spectrum_id='test', 
heteronuc='C', proton='HE1', int_method='height')
 
         # Test the data.
-        self.assertEqual(cdp.mol[0].res[0].spin[0].intensities.values()[0], 
7.123e+03)
+        
self.assertEqual(list(cdp.mol[0].res[0].spin[0].intensities.values())[0], 
7.123e+03)

Related Messages


Powered by MHonArc, Updated Wed Oct 03 01:40:02 2012