Author: bugman Date: Fri Mar 8 15:28:19 2013 New Revision: 18704 URL: http://svn.gna.org/viewcvs/relax?rev=18704&view=rev Log: Python 3 fix for the test_format_table4() unit test of lib.text.table.format_table(). The string representation of the builtin list object is different in Python 2 vs. 3. Modified: trunk/test_suite/unit_tests/_lib/_text/test_table.py Modified: trunk/test_suite/unit_tests/_lib/_text/test_table.py URL: http://svn.gna.org/viewcvs/relax/trunk/test_suite/unit_tests/_lib/_text/test_table.py?rev=18704&r1=18703&r2=18704&view=diff ============================================================================== --- trunk/test_suite/unit_tests/_lib/_text/test_table.py (original) +++ trunk/test_suite/unit_tests/_lib/_text/test_table.py Fri Mar 8 15:28:19 2013 @@ -175,7 +175,7 @@ ['Column 1', 'Column 2', 'Column 3', 'Column 4'] ] contents = [ - ['A', 2, 3.4561234124, list], + ['A', 2, 3.4561234124, [1,2.0]], ['B', 2, 4.567745674, 1e-6] ] @@ -185,30 +185,30 @@ # The true table. true_table = [ - " ________________________________________________ ", - " ", - " Long text span test ", - " ", - " Column 1 Column 2 Column 3 Column 4 ", - " ________________________________________________ ", - " ", - " A 2 3.456 <type 'list'> ", - " ", - " B 2 4.568 1e-06 ", - " ________________________________________________ ", - " ", - "" # This is because split combined with a final \n character. - ] - - # Printout. - print("The formatted table:") - for i in range(len(table_lines)): - print("'%s'" % table_lines[i]) - print("\nWhat the table should look like:") - for i in range(len(true_table)): - print("'%s'" % true_table[i]) - - # Check the table. - self.assertEqual(len(true_table), len(table_lines)) - for i in range(len(table_lines)): - self.assertEqual(true_table[i], table_lines[i]) + " ___________________________________________ ", + " ", + " Long text span test ", + " ", + " Column 1 Column 2 Column 3 Column 4 ", + " ___________________________________________ ", + " ", + " A 2 3.456 [1, 2.0] ", + " ", + " B 2 4.568 1e-06 ", + " ___________________________________________ ", + " ", + "" # This is because split combined with a final \n character. + ] + + # Printout. + print("The formatted table:") + for i in range(len(table_lines)): + print("'%s'" % table_lines[i]) + print("\nWhat the table should look like:") + for i in range(len(true_table)): + print("'%s'" % true_table[i]) + + # Check the table. + self.assertEqual(len(true_table), len(table_lines)) + for i in range(len(table_lines)): + self.assertEqual(true_table[i], table_lines[i])