opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

These we will revert to their original yaml.load

Browse Source 
It would be nice to fix them eventually, but we'll settle for an
incremental improvement.
This commit is contained in:
E Rasche
2017-09-25 11:39:14 +02:00
parent 93ffc4055b
commit d79a2459a9
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/tools/parser/factory.py
+1 -1
View File
@@ -62,7 +62,7 @@ def ordered_load(stream):
yaml.resolver.BaseResolver.DEFAULT_MAPPING_TAG,
construct_mapping)
return yaml.safe_load(stream, OrderedLoader)
return yaml.load(stream, OrderedLoader)
def get_input_source(content):
lib/galaxy/webapps/config_manage.py
+2 -2
View File
@@ -669,7 +669,7 @@ def _ordered_load(stream):
def include(self, node):
filename = os.path.join(self._root, self.construct_scalar(node))
with open(filename, 'r') as f:
return yaml.safe_load(f, OrderedLoader)
return yaml.load(f, OrderedLoader)
def construct_mapping(loader, node):
loader.flatten_mapping(node)
@@ -680,7 +680,7 @@ def _ordered_load(stream):
construct_mapping)
OrderedLoader.add_constructor('!include', OrderedLoader.include)
return yaml.safe_load(stream, OrderedLoader)
return yaml.load(stream, OrderedLoader)
def _ordered_dump(data, stream=None, Dumper=yaml.Dumper, **kwds):