simplify condition

sourmash-bio · Jul 8, 2019 · 306c890 · 306c890
1 parent a6ad959
commit 306c890
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/sourmash/sbt.py b/sourmash/sbt.py
@@ -148,8 +148,8 @@ def new_node_pos(self, node):
         next_internal_node = None
         if self.next_node <= min_leaf:
             for i in range(min_leaf):
-                if all((self._nodes.get(i, None) is None,
-                        self._leaves.get(i, None) is None,
+                if all((i not in self._nodes,
+                        i not in self._leaves,
                         i not in self._missing_nodes)):
                     next_internal_node = i
                     break

diff --git a/tests/test_sourmash.py b/tests/test_sourmash.py
@@ -697,7 +697,7 @@ def test_do_basic_compare(c):
 
     cmp_outfile = c.output('cmp')
     assert os.path.exists(cmp_outfile)
-    cmp_out = numpy.load(cmp_outfile.encode('utf-8'))
+    cmp_out = numpy.load(cmp_outfile)
 
     sigs = []
     for fn in testsigs:
@@ -727,7 +727,7 @@ def test_do_basic_compare_using_rna_arg(c):
 
     cmp_outfile = c.output('cmp')
     assert os.path.exists(cmp_outfile)
-    cmp_out = numpy.load(cmp_outfile.encode('utf-8'))
+    cmp_out = numpy.load(cmp_outfile)
 
     sigs = []
     for fn in testsigs: