r18326 - in /trunk/test_suite: system_tests/pipes.py unit_tests/_generic_fns/_structure/test_scientific.py -- January 28, 2013 - 11:17

Author: bugman
Date: Mon Jan 28 11:17:55 2013
New Revision: 18326

URL: http://svn.gna.org/viewcvs/relax?rev=18326&view=rev
Log:
Python 3 fixes for the list sort() method - this has been replaced by the 
builtin sorted() function.


Modified:
    trunk/test_suite/system_tests/pipes.py
    trunk/test_suite/unit_tests/_generic_fns/_structure/test_scientific.py

Modified: trunk/test_suite/system_tests/pipes.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/pipes.py?rev=18326&r1=18325&r2=18326&view=diff
==============================================================================
--- trunk/test_suite/system_tests/pipes.py (original)
+++ trunk/test_suite/system_tests/pipes.py Mon Jan 28 11:17:55 2013
@@ -73,8 +73,7 @@
         self.assertEqual(pipes.has_bundle('test bundle 1'), True)
         self.assertEqual(pipes.has_bundle('test bundle 2'), True)
         self.assertEqual(pipes.has_bundle('test bundle 3'), False)
-        bundles = pipes.bundle_names()
-        bundles.sort()
+        bundles = sorted(pipes.bundle_names())
         self.assertEqual(bundles, ['test bundle 1', 'test bundle 2'])
         for pipe, name in pipes.pipe_loop(name=True):
             self.assert_(name in ['test pipe 1', 'test pipe 2', 'test pipe 
3', 'test pipe 4', 'test pipe 5', 'test pipe 6'])

Modified: 
trunk/test_suite/unit_tests/_generic_fns/_structure/test_scientific.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/unit_tests/_generic_fns/_structure/test_scientific.py?rev=18326&r1=18325&r2=18326&view=diff
==============================================================================
--- trunk/test_suite/unit_tests/_generic_fns/_structure/test_scientific.py 
(original)
+++ trunk/test_suite/unit_tests/_generic_fns/_structure/test_scientific.py 
Mon Jan 28 11:17:55 2013
@@ -90,8 +90,7 @@
         self.assertEqual(res_num, 12)
         self.assertEqual(res_name, 'GLY')
         self.assertEqual(len(res.atoms), 7)
-        atom_keys = list(res.atoms.keys())
-        atom_keys.sort()
+        atom_keys = sorted(res.atoms.keys())
         self.assertEqual(atom_keys, ['1HA', '2HA', 'C', 'CA', 'H', 'N', 
'O'])   # Sorted key comparison needed as key order is not preserved in 
Python 3.
 
 
@@ -116,8 +115,7 @@
         self.assertEqual(res_num, 12)
         self.assertEqual(res_name, 'GLY')
         self.assertEqual(len(res.atoms), 7)
-        atom_keys = list(res.atoms.keys())
-        atom_keys.sort()
+        atom_keys = sorted(res.atoms.keys())
         self.assertEqual(atom_keys, ['1HA', '2HA', 'C', 'CA', 'H', 'N', 
'O'])   # Sorted key comparison needed as key order is not preserved in 
Python 3.