Change Newick ext to be newick instead of nhx

galaxyproject · Jun 5, 2018 · 64ce15f · 64ce15f
1 parent 994d78f
commit 64ce15f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/galaxy/datatypes/data.py b/lib/galaxy/datatypes/data.py
@@ -932,7 +932,7 @@ class Newick(Text):
     """New Hampshire/Newick Format"""
     edam_data = "data_0872"
     edam_format = "format_1910"
-    file_ext = "nhx"
+    file_ext = "newick"
 
     def __init__(self, **kwd):
         """Initialize foobar datatype"""

diff --git a/lib/galaxy/visualization/data_providers/phyloviz/__init__.py b/lib/galaxy/visualization/data_providers/phyloviz/__init__.py
@@ -26,7 +26,7 @@ def get_data(self, tree_index=0):
         jsonDicts = []
         rval = {'dataset_type': self.dataset_type}
 
-        if file_ext == "nhx":  # parses newick files
+        if file_ext in ["newick", "nhx"]:  # parses newick files
             newickParser = Newick_Parser()
             jsonDicts, parseMsg = newickParser.parseFile(file_name)
         elif file_ext == "phyloxml":  # parses phyloXML files