refactor nodes.py:tree()

logging_tree/nodes.py

@@ -2,6 +2,23 @@
 
 import logging
 
+
+def _get_parent_name(name):
+    """
+    >>> _get_parent_name('a')
+    ''
+    >>> _get_parent_name('a.b')
+    'a'
+    >>> _get_parent_name('a.b.c')
+    'a.b'
+    """
+    i = name.rfind('.', 0, len(name) - 1)  # same formula used in `logging`
+    if i == -1:
+        return ''
+    else:
+        return name[:i]
+
+
 def tree():
     """Return a tree of tuples representing the logger layout.
 
@@ -11,15 +28,11 @@ def tree():
 
     """
     root = ('', logging.root, [])
-    nodes = {}
+    nodes = {'': root}
     items = list(logging.root.manager.loggerDict.items())  # for Python 2 and 3
     items.sort()
     for name, logger in items:
         nodes[name] = node = (name, logger, [])
-        i = name.rfind('.', 0, len(name) - 1)  # same formula used in `logging`
-        if i == -1:
-            parent = root
-        else:
-            parent = nodes[name[:i]]
-        parent[2].append(node)
+        _, _, parent_childs = nodes[_get_parent_name(name)]
+        parent_childs.append(node)
     return root

logging_tree/tests/test_node.py

@@ -44,6 +44,11 @@ def test_two_level_tree_with_placeholder(self):
                             ]),
                     ]))
 
+def load_tests(loader, suite, ignore):
+    import doctest
+    import logging_tree.nodes
+    suite.addTests(doctest.DocTestSuite(logging_tree.nodes))
+    return suite
 
 if __name__ == '__main__':  # for Python <= 2.4
     unittest.main()