diff --git a/lib/galaxy/datatypes/display_applications/application.py b/lib/galaxy/datatypes/display_applications/application.py index 6cd9acb3517..8c1970f7d99 100644 --- a/lib/galaxy/datatypes/display_applications/application.py +++ b/lib/galaxy/datatypes/display_applications/application.py @@ -1,5 +1,6 @@ # Contains objects for using external display applications import logging +from collections import OrderedDict from copy import deepcopy from six import string_types @@ -9,7 +10,6 @@ from galaxy.util import ( parse_xml, string_as_bool ) -from galaxy.util.odict import odict from galaxy.util.template import fill_template from .parameters import ( DEFAULT_DATASET_NAME, @@ -41,7 +41,7 @@ class DisplayApplicationLink(object): def __init__(self, display_application): self.display_application = display_application - self.parameters = odict() # parameters are populated in order, allowing lower listed ones to have values of higher listed ones + self.parameters = OrderedDict() # parameters are populated in order, allowing lower listed ones to have values of higher listed ones self.url_param_name_map = {} self.url = None self.id = None @@ -59,9 +59,9 @@ class DisplayApplicationLink(object): def get_inital_values(self, data, trans): if self.other_values: - rval = odict(self.other_values) + rval = OrderedDict(self.other_values) else: - rval = odict() + rval = OrderedDict() rval.update({'BASE_URL': trans.request.base, 'APP': trans.app}) # trans automatically appears as a response, need to add properties of trans that we want here BASE_PARAMS = {'qp': quote_plus, 'url_for': trans.app.url_for} for key, value in BASE_PARAMS.items(): # add helper functions/variables @@ -280,7 +280,7 @@ class DisplayApplication(object): if version is None: version = "1.0.0" self.version = version - self.links = odict() + self.links = OrderedDict() self._filename = filename self._elem = elem self._data_table_versions = {}