1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/b172ca94e169/ Changeset: b172ca94e169 User: jmchilton Date: 2014-04-24 03:33:41 Summary: Fix Python 3 incompat in galaxy.jobs.runners.util.
Module shared with LWR so hoping for Python 3 compat. Affected #: 2 files
diff -r 776e13962bbc861a94242e142e73278c9499dc70 -r b172ca94e169ccf2450432398d67623f79c5588f lib/galaxy/jobs/runners/util/__init__.py --- a/lib/galaxy/jobs/runners/util/__init__.py +++ b/lib/galaxy/jobs/runners/util/__init__.py @@ -3,7 +3,5 @@ processes and interfacing with job managers. This module should contain functionality shared between Galaxy and the LWR. """ -try: - from galaxy.util.bunch import Bunch -except ImportError: - from lwr.util import Bunch + +from galaxy.util.bunch import Bunch
diff -r 776e13962bbc861a94242e142e73278c9499dc70 -r b172ca94e169ccf2450432398d67623f79c5588f lib/galaxy/jobs/runners/util/condor/__init__.py --- a/lib/galaxy/jobs/runners/util/condor/__init__.py +++ b/lib/galaxy/jobs/runners/util/condor/__init__.py @@ -20,7 +20,8 @@
def submission_params(prefix=SUBMIT_PARAM_PREFIX, **kwds): submission_params = {} - for key, value in kwds.iteritems(): + for key in kwds: + value = kwds[key] key = key.lower() if key.startswith(prefix): condor_key = key[len(prefix):]
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.