[galaxy-commits] commit/galaxy-central: natefoo: Fix unit tests on Python 2.5 (can't load s3_multipart_upload.py).

[Bitbucket]

1 new commit in galaxy-central:


https://bitbucket.org/galaxy/galaxy-central/changeset/56bdee21dc78/
changeset:   56bdee21dc78
user:        natefoo
date:        2012-01-27 17:12:56
summary:     Fix unit tests on Python 2.5 (can't load s3_multipart_upload.py).
affected #:  1 file

diff -r f9ca1c23ae7d2614c002257365d67a3eae98228e -r 56bdee21dc785c5f941510537978d71c4e9799c5 lib/galaxy/objectstore/s3_multipart_upload.py
--- a/lib/galaxy/objectstore/s3_multipart_upload.py
+++ b/lib/galaxy/objectstore/s3_multipart_upload.py
@@ -4,13 +4,19 @@
 This parallelizes the task over available cores using multiprocessing.
 Code mostly taken form CloudBioLinux.
 """
+from __future__ import with_statement
+
 import os
+import sys
 import glob
 import subprocess
 import contextlib
 import functools
-import multiprocessing
-from multiprocessing.pool import IMapIterator
+
+if sys.version_info >= (2, 6):
+    # this is just to prevent unit tests from failing
+    import multiprocessing
+    from multiprocessing.pool import IMapIterator
 
 from galaxy import eggs
 eggs.require('boto')

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.