python3 sortby

tanghaibao · Sep 16, 2018 · 34c1ed5 · 34c1ed5
1 parent cc1f5dd
commit 34c1ed5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/goatools/rpt/write_hierarchy_base.py b/goatools/rpt/write_hierarchy_base.py
@@ -59,7 +59,8 @@ def prt_hier_rec(self, item_id, depth=1):
         depth += 1
         if self.max_indent is not None and depth > self.max_indent:
             return
-        for child in sorted(obj.children, key=self.sortby):
+        children = obj.children if self.sortby is None else sorted(obj.children, key=self.sortby)
+        for child in children:
             self.prt_hier_rec(child.item_id, depth)
 
     def _prtfmt(self, item_id, dashes):

diff --git a/makefile b/makefile
@@ -277,6 +277,7 @@ NOSETESTS := \
 # Run all tests. If you are submitting a pull request, all tests must pass.
 test:
 	py.test -v tests/
+	python3 -m pytest -v tests
 	make chk_parsers
 	# py.test tests/ --log-file=pytest.log