# HG changeset patch # User Jim Johnson # Date 1325795484 21600 # Node ID 93911bac43da3c97cc9b6ac492e0e83ce7ee19de # Parent 7f032685214b1fdf652a4ce9134a66c81ae77048 Modifications for ToolShed proprietary data types diff -r 7f032685214b -r 93911bac43da lib/galaxy/datatypes/gmap.py --- a/lib/galaxy/datatypes/gmap.py Thu Dec 08 11:16:03 2011 -0600 +++ b/lib/galaxy/datatypes/gmap.py Thu Jan 05 14:31:24 2012 -0600 @@ -3,10 +3,10 @@ """ import logging import os,os.path,re -import data -from data import Text +import galaxy.datatypes.data +from galaxy.datatypes.data import Text from galaxy import util -from metadata import MetadataElement +from galaxy.datatypes.metadata import MetadataElement log = logging.getLogger(__name__) diff -r 7f032685214b -r 93911bac43da tool-data/datatypes_conf.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tool-data/datatypes_conf.xml Thu Jan 05 14:31:24 2012 -0600 @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + +