1 new commit in galaxy-central:

https://bitbucket.org/galaxy/galaxy-central/commits/3110de3062ac/ changeset: 3110de3062ac user: dannon date: 2013-03-01 14:07:56 summary: Bugfix: Missing paste import in data.py, log being used before definition. affected #: 1 file

diff -r 1ba69c9ded069f0ccdc1e27d349637b96821431e -r 3110de3062acd1eea7f57b717b434a44b0429447 lib/galaxy/datatypes/data.py --- a/lib/galaxy/datatypes/data.py +++ b/lib/galaxy/datatypes/data.py @@ -1,14 +1,21 @@ -import logging, os, sys, time, tempfile +import logging +import metadata +import mimetypes +import os +import sys +import tempfile +import zipfile +from cgi import escape from galaxy import util +from galaxy.datatypes.metadata import MetadataElement #import directly to maintain ease of use in Datatype class definitions +from galaxy.util import inflector +from galaxy.util.bunch import Bunch from galaxy.util.odict import odict -from galaxy.util.bunch import Bunch -from galaxy.util import inflector from galaxy.util.sanitize_html import sanitize_html -from cgi import escape -import mimetypes -import metadata -import zipfile -from metadata import MetadataElement #import directly to maintain ease of use in Datatype class definitions + +from galaxy import eggs +eggs.require( "Paste" ) +import paste

if sys.version_info[:2] < ( 2, 6 ): @@ -16,6 +23,8 @@ if sys.version_info[:2] < ( 2, 5 ): zipfile.LargeZipFile = zipfile.error

+log = logging.getLogger(__name__) + tmpd = tempfile.mkdtemp() comptypes=[] ziptype = '32' @@ -36,7 +45,6 @@ pass os.rmdir( tmpd )

-log = logging.getLogger(__name__)

# Valid first column and strand column values vor bed, other formats col1_startswith = ['chr', 'chl', 'groupun', 'reftig_', 'scaffold', 'super_', 'vcho']

Repository URL: https://bitbucket.org/galaxy/galaxy-central/

--

This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.