From b397281f0e8865df68b29c98bd109b16adb0d40a Mon Sep 17 00:00:00 2001
From: Ask Solem <ask@celeryproject.org>
Date: Fri, 22 Jun 2012 14:35:31 +0100
Subject: [PATCH] librabbitmq import error should show the right name

---
 kombu/transport/librabbitmq.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/kombu/transport/librabbitmq.py b/kombu/transport/librabbitmq.py
index e0d349b7..62baec96 100644
--- a/kombu/transport/librabbitmq.py
+++ b/kombu/transport/librabbitmq.py
@@ -18,8 +18,11 @@ try:
     import librabbitmq as amqp
     from librabbitmq import ChannelError, ConnectionError
 except ImportError:
-    import pylibrabbitmq as amqp                             # noqa
-    from pylibrabbitmq import ChannelError, ConnectionError  # noqa
+    try:
+        import pylibrabbitmq as amqp                             # noqa
+        from pylibrabbitmq import ChannelError, ConnectionError  # noqa
+    except ImportError:
+        raise ImportError("No module named librabbitmq")
 
 from kombu.exceptions import StdChannelError
 from kombu.utils.amq_manager import get_manager