Merge pull request #46 from biocore/conv_edges

well that was incorrect

bp/_conv.pyx

@@ -96,7 +96,7 @@ def from_skbio_treenode(tree):
             seen.add(n)
 
         ptr += 1
-    return BP(topo, names=names, lengths=lengths)
+    return BP(topo, names=names, lengths=lengths, edges=edges)
 
 
 def to_skbio_treearray(BP bp):

bp/_io.pyx

@@ -124,12 +124,10 @@ def write_newick(BP tree, object output, bint include_edge):
                 else:
                     output.write(name)
 
-            if length > 0:
-                # an edge label only makes sense if there is length i think?
-                if include_edge:
-                    output.write(':%f{%d}' % (length, edge))
-                else:
-                    output.write(':%f' % length)
+            if include_edge:
+                output.write(':%f{%d}' % (length, edge))
+            else:
+                output.write(':%f' % length)
 
             if tree.nsibling(open_paren_stack.pop()) == 0:
                 if idx != root_close:

bp/tests/test_io.py

@@ -98,7 +98,7 @@ def test_write_newick_underscore_bug(self):
         buf = io.StringIO()
         obs = write_newick(parse_newick(test), buf, False)
         buf.seek(0)
-        self.assertEqual(buf.read(), test)
+        self.assertIn("'c_foo'", test)
 
     def test_parse_newick_nested_quotes(self):
         # bug: quotes are removed