r18717 - in /branches/frame_order_testing: ./ lib/text/table.py test_suite/unit_tests/_lib/_text/test_table.py -- March 08, 2013 - 18:32

Author: bugman
Date: Fri Mar  8 18:32:01 2013
New Revision: 18717

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

........
  r18715 | bugman | 2013-03-08 18:28:35 +0100 (Fri, 08 Mar 2013) | 3 lines
  
  Modified the test_format_table5() unit test of 
lib.text.table.format_table() to check bool types.
........
  r18716 | bugman | 2013-03-08 18:30:47 +0100 (Fri, 08 Mar 2013) | 3 lines
  
  The lib.text.table.format_table() function now handles boolean types.
........

Modified:
    branches/frame_order_testing/   (props changed)
    branches/frame_order_testing/lib/text/table.py
    
branches/frame_order_testing/test_suite/unit_tests/_lib/_text/test_table.py

Propchange: branches/frame_order_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Mar  8 18:32:01 2013
@@ -1,1 +1,1 @@
-/trunk:1-18713
+/trunk:1-18716

Modified: branches/frame_order_testing/lib/text/table.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/lib/text/table.py?rev=18717&r1=18716&r2=18717&view=diff
==============================================================================
--- branches/frame_order_testing/lib/text/table.py (original)
+++ branches/frame_order_testing/lib/text/table.py Fri Mar  8 18:32:01 2013
@@ -88,6 +88,10 @@
                     data[i][j] = custom_format[j] % data[i][j]
                 except TypeError:
                     data[i][j] = "%s" % data[i][j]
+
+            # Bool types.
+            elif isinstance(data[i][j], bool):
+                data[i][j] = "%s" % data[i][j]
 
             # Int types.
             elif isinstance(data[i][j], int):

Modified: 
branches/frame_order_testing/test_suite/unit_tests/_lib/_text/test_table.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/unit_tests/_lib/_text/test_table.py?rev=18717&r1=18716&r2=18717&view=diff
==============================================================================
--- 
branches/frame_order_testing/test_suite/unit_tests/_lib/_text/test_table.py 
(original)
+++ 
branches/frame_order_testing/test_suite/unit_tests/_lib/_text/test_table.py 
Fri Mar  8 18:32:01 2013
@@ -220,7 +220,7 @@
         # The table data.
         contents = [
             ['A', 2],
-            ['B', 2]
+            ['B', True]
         ]
 
         # Create the table.
@@ -229,12 +229,12 @@
 
         # The true table.
         true_table = [
-            " _______ ",
-            "         ",
-            "  A   2  ",
-            "  B   2  ",
-            " _______ ",
-            "         ",
+            " __________ ",
+            "            ",
+            "  A      2  ",
+            "  B   True  ",
+            " __________ ",
+            "            ",
             ""    # This is because split combined with a final \n character.
         ]