Merge pull request #4784 from jmchilton/tool_xml_warning

[17.09] Bug fix for XML warning during tool loads.
galaxyproject · Oct 10, 2017 · fd8e2e1 · fd8e2e1
2 parents 2b18a0b + fb7015b
commit fd8e2e1
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/galaxy/tools/parser/xml.py b/lib/galaxy/tools/parser/xml.py
@@ -200,7 +200,7 @@ def parse_input_pages(self):
     def parse_provided_metadata_style(self):
         style = None
         out_elem = self.root.find("outputs")
-        if out_elem and "provided_metadata_style" in out_elem.attrib:
+        if out_elem is not None and "provided_metadata_style" in out_elem.attrib:
             style = out_elem.attrib["provided_metadata_style"]
 
         if style is None:
@@ -212,7 +212,7 @@ def parse_provided_metadata_style(self):
     def parse_provided_metadata_file(self):
         provided_metadata_file = "galaxy.json"
         out_elem = self.root.find("outputs")
-        if out_elem and "provided_metadata_file" in out_elem.attrib:
+        if out_elem is not None and "provided_metadata_file" in out_elem.attrib:
             provided_metadata_file = out_elem.attrib["provided_metadata_file"]
 
         return provided_metadata_file