Mercurial > repos > rnateam > dorina

diff data_source.py @ 1:32c27a1d81a4 draft default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
planemo upload for repository https://github.com/bgruening/galaxytools/tree/master/tools/rna_tools/dorina/ commit d720bfabe099baad94dfe54442cb6a4dd023524a
author rnateam
date Fri, 07 Oct 2016 09:43:28 -0400
parents f388dcb96df8
children
line wrap: on
line diff
--- a/data_source.py	Wed May 27 05:45:49 2015 -0400
+++ b/data_source.py	Fri Oct 07 09:43:28 2016 -0400
@@ -3,12 +3,12 @@
 # Data source application parameters are temporarily stored in the dataset file.
 import socket, urllib, sys, os
 from galaxy import eggs #eggs needs to be imported so that galaxy.util can find docutils egg...
-from galaxy.util.json import loads, dumps
 from galaxy.util import get_charset_from_http_headers
 import galaxy.model # need to import model before sniff to resolve a circular import dependency
 from galaxy.datatypes import sniff
 from galaxy.datatypes.registry import Registry
 from galaxy.jobs import TOOL_PROVIDED_JOB_METADATA_FILE
+from json import loads, dumps
 
 assert sys.version_info[:2] >= ( 2, 4 )