[Checkins] SVN: z3c.coverage/trunk/ Bugfix: sorting by numbered of uncovered lines was broken.

[Marius Gedminas]

Log message for revision 127751:
  Bugfix: sorting by numbered of uncovered lines was broken.

Changed:
  U   z3c.coverage/trunk/CHANGES.txt
  U   z3c.coverage/trunk/src/z3c/coverage/coveragereport.py
  U   z3c.coverage/trunk/src/z3c/coverage/tests.py

-=-
Modified: z3c.coverage/trunk/CHANGES.txt
===================================================================
--- z3c.coverage/trunk/CHANGES.txt	2012-09-06 12:47:20 UTC (rev 127750)
+++ z3c.coverage/trunk/CHANGES.txt	2012-09-06 13:23:43 UTC (rev 127751)
@@ -5,6 +5,8 @@
 1.2.1 (unreleased)
 ------------------
 
+- Bugfix: sorting by numbered of uncovered lines was broken.
+
 - The ``coveragereport`` script now accepts ``--help``, ``--verbose`` and
   ``--quiet`` options, with verbose being on by default.
 

Modified: z3c.coverage/trunk/src/z3c/coverage/coveragereport.py
===================================================================
--- z3c.coverage/trunk/src/z3c/coverage/coveragereport.py	2012-09-06 12:47:20 UTC (rev 127750)
+++ z3c.coverage/trunk/src/z3c/coverage/coveragereport.py	2012-09-06 13:23:43 UTC (rev 127751)
@@ -183,7 +183,7 @@
     """
     function(tree, index)
     for key, node in sorted(tree.items(), key=order_by):
-        traverse_tree(node, index + [key], function)
+        traverse_tree_in_order(node, index + [key], function, order_by)
 
 
 def index_to_url(index):

Modified: z3c.coverage/trunk/src/z3c/coverage/tests.py
===================================================================
--- z3c.coverage/trunk/src/z3c/coverage/tests.py	2012-09-06 12:47:20 UTC (rev 127750)
+++ z3c.coverage/trunk/src/z3c/coverage/tests.py	2012-09-06 13:23:43 UTC (rev 127751)
@@ -9,7 +9,29 @@
 
 from zope.testing import renormalizing
 
+from z3c.coverage.coveragereport import traverse_tree_in_order
 
+
+def doctest_traverse_tree_in_order():
+    """Test for traverse_tree_in_order
+
+        >>> tree = dict(a=dict(b={}, c={}, d={}), b=dict(x={}, y={}, z={}))
+        >>> def pr_index(tree, index):
+        ...     print index
+        >>> traverse_tree_in_order(tree, [], pr_index, lambda (k, n): k)
+        []
+        ['a']
+        ['a', 'b']
+        ['a', 'c']
+        ['a', 'd']
+        ['b']
+        ['b', 'x']
+        ['b', 'y']
+        ['b', 'z']
+
+    """
+
+
 def test_suite():
     checker = renormalizing.RENormalizing([
                 # optparse in Python 2.4 prints "usage:" and "options:",
@@ -26,6 +48,7 @@
             'coveragediff.txt', checker=checker,
             optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
             ),
+        doctest.DocTestSuite(),
         doctest.DocTestSuite(
             'z3c.coverage.coveragediff'),
         doctest.DocTestSuite(