Skip to content

Commit

Permalink
Fix typo (UnitializedTree -> UninitializedTree)
Browse files Browse the repository at this point in the history
  • Loading branch information
mvdbeek committed Jun 12, 2018
1 parent fc06a7a commit b46ab96
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
14 changes: 7 additions & 7 deletions lib/galaxy/dataset_collections/structure.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def __init__(self, collection_type_description):


@six.python_2_unicode_compatible
class UnitializedTree(BaseTree):
class UninitializedTree(BaseTree):
children_known = False

def clone(self):
Expand All @@ -59,10 +59,10 @@ def multiply(self, other_structure):
return self.clone()

new_collection_type = self.collection_type_description.multiply(other_structure.collection_type_description)
return UnitializedTree(new_collection_type)
return UninitializedTree(new_collection_type)

def __str__(self):
return "UnitializedTree[collection_type=%s]" % self.collection_type_description
return "UninitializedTree[collection_type=%s]" % self.collection_type_description


@six.python_2_unicode_compatible
Expand Down Expand Up @@ -158,7 +158,7 @@ def tool_output_to_structure(get_sliced_input_collection_structure, tool_output,
if collection_type and tree.collection_type_description.collection_type != collection_type:
# See tool paired_collection_map_over_structured_like - type should
# override structured_like if they disagree.
tree = UnitializedTree(collection_type_descriptions.for_collection_type(collection_type))
tree = UninitializedTree(collection_type_descriptions.for_collection_type(collection_type))
else:
# Can't pre-compute the structure in this case, see if we can find a collection type.
if collection_type is None and tool_output.structure.collection_type_source:
Expand All @@ -167,10 +167,10 @@ def tool_output_to_structure(get_sliced_input_collection_structure, tool_output,
if not collection_type:
raise Exception("Failed to determine collection type for mapping over output %s" % tool_output.name)

tree = UnitializedTree(collection_type_descriptions.for_collection_type(collection_type))
tree = UninitializedTree(collection_type_descriptions.for_collection_type(collection_type))

if not tree.children_known and tree.collection_type_description.collection_type == "paired":
# TODO: We don't need to return unitializedtree for pairs I think, we should build
# TODO: We don't need to return UninitializedTree for pairs I think, we should build
# a paired tree for the known structure here.
pass
return tree
Expand All @@ -185,7 +185,7 @@ def get_structure(dataset_collection_instance, collection_type_description, leaf
collection_type_description = collection_type_description.effective_collection_type_description(leaf_subcollection_type)
if hasattr(dataset_collection_instance, 'child_collection'):
collection_type_description = collection_type_description.collection_type_description_factory.for_collection_type(leaf_subcollection_type)
return UnitializedTree(collection_type_description)
return UninitializedTree(collection_type_description)

collection = dataset_collection_instance.collection
return Tree.for_dataset_collection(collection, collection_type_description)
4 changes: 2 additions & 2 deletions lib/galaxy/tools/actions/upload.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import logging
import os

from galaxy.dataset_collections.structure import UnitializedTree
from galaxy.dataset_collections.structure import UninitializedTree
from galaxy.exceptions import RequestParameterMissingException
from galaxy.tools.actions import upload_common
from galaxy.util import ExecutionTimer
Expand Down Expand Up @@ -138,7 +138,7 @@ def _precreate_fetched_collection_instance(trans, history, target, outputs):

collections_service = trans.app.dataset_collections_service
collection_type_description = collections_service.collection_type_descriptions.for_collection_type(collection_type)
structure = UnitializedTree(collection_type_description)
structure = UninitializedTree(collection_type_description)
hdca = collections_service.precreate_dataset_collection_instance(
trans, history, name, structure=structure
)
Expand Down
4 changes: 2 additions & 2 deletions lib/galaxy/tools/parameters/output_collect.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from collections import namedtuple

from galaxy import util
from galaxy.dataset_collections.structure import UnitializedTree
from galaxy.dataset_collections.structure import UninitializedTree
from galaxy.tools.parser.output_collection_def import (
DEFAULT_DATASET_COLLECTOR_DESCRIPTION,
INPUT_DBKEY_TOKEN,
Expand Down Expand Up @@ -233,7 +233,7 @@ def add_elements_to_folder(elements, library_folder):
name = unnamed_output_dict.get("name", "unnamed collection")
collection_type = unnamed_output_dict["collection_type"]
collection_type_description = collections_service.collection_type_descriptions.for_collection_type(collection_type)
structure = UnitializedTree(collection_type_description)
structure = UninitializedTree(collection_type_description)
hdca = collections_service.precreate_dataset_collection_instance(
trans, history, name, structure=structure
)
Expand Down

0 comments on commit b46ab96

Please sign in to comment.