From c05bef0908ffd5ca4ab16ee49bdbf048aeb45bc8 Mon Sep 17 00:00:00 2001
From: Dannon Baker <dannon.baker@gmail.com>
Date: Mon, 19 May 2014 18:11:52 -0400
Subject: [PATCH] Add conditional requirement of importlib for python
 2.6/kombu.

---
 eggs.ini                   | 1 +
 lib/galaxy/queue_worker.py | 5 +++++
 lib/galaxy/queues.py       | 7 ++++++-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/eggs.ini b/eggs.ini
index dc08bf23bde..c78e3fb055b 100644
--- a/eggs.ini
+++ b/eggs.ini
@@ -43,6 +43,7 @@ drmaa = 0.6
 elementtree = 1.2.6_20050316
 Fabric = 1.7.0
 GeneTrack = 2.0.0_beta_1
+importlib = 1.0.3
 kombu = 3.0.12
 lrucache = 0.2
 Mako = 0.4.1
diff --git a/lib/galaxy/queue_worker.py b/lib/galaxy/queue_worker.py
index 2d382968f9d..9ab2e3be66c 100644
--- a/lib/galaxy/queue_worker.py
+++ b/lib/galaxy/queue_worker.py
@@ -5,8 +5,13 @@ reloading the toolbox, etc., across multiple processes.
 
 import logging
 import threading
+import sys
+
 import galaxy.queues
 from galaxy import eggs, util
+if sys.version_info < (2, 7, 0):
+    # Kombu requires importlib to function under Python 2.6.
+    eggs.require('importlib')
 eggs.require('kombu')
 
 from kombu import Connection
diff --git a/lib/galaxy/queues.py b/lib/galaxy/queues.py
index 5805bdb1e8c..0b0b8c1e419 100644
--- a/lib/galaxy/queues.py
+++ b/lib/galaxy/queues.py
@@ -4,9 +4,14 @@ All message queues used by Galaxy
 
 """
 
+import sys
+
 from galaxy import eggs
 
-eggs.require("kombu")
+if sys.version_info < (2, 7, 0):
+    # Kombu requires importlib to function in Python 2.6.
+    eggs.require('importlib')
+eggs.require('kombu')
 from kombu import Exchange, Queue
 
 ALL_CONTROL = "control.*"