Removed some carrot references

kombu/__init__.py

@@ -2,8 +2,8 @@
 VERSION = (0, 1, 0)
 __version__ = ".".join(map(str, VERSION))
 __author__ = "Ask Solem"
-__contact__ = "askh@opera.com"
-__homepage__ = "http://github.com/ask/carrot/"
+__contact__ = "ask@celeryproject.org"
+__homepage__ = "http://github.com/ask/kombu/"
 __docformat__ = "restructuredtext"
 
 import os

kombu/backends/pyamqplib.py

@@ -1,10 +1,3 @@
-"""
-
-`amqplib`_ backend for carrot.
-
-.. _`amqplib`: http://barryp.org/software/py-amqplib/
-
-"""
 import socket
 
 from amqplib import client_0_8 as amqp
@@ -105,13 +98,6 @@ def channel(self, channel_id=None):
 class Message(BaseMessage):
     """A message received by the broker.
 
-    Usually you don't insantiate message objects yourself, but receive
-    them using a :class:`carrot.messaging.Consumer`.
-
-    :param backend: see :attr:`backend`.
-    :param amqp_message: see :attr:`_amqp_message`.
-
-
     .. attribute:: body
 
         The message body.
@@ -120,21 +106,13 @@ class Message(BaseMessage):
 
         The message delivery tag, uniquely identifying this message.
 
-    .. attribute:: backend
-
-        The message backend used.
-        A subclass of :class:`carrot.backends.base.BaseBackend`.
-
-    .. attribute:: _amqp_message
+    .. attribute:: channel
 
-        A :class:`amqplib.client_0_8.basic_message.Message` instance.
-        This is a private attribute and should not be accessed by
-        production code.
+        The channel instance the message was received on.
 
     """
 
     def __init__(self, channel, amqp_message, **kwargs):
-        self._amqp_message = amqp_message
         self.channel = channel
 
         for attr_name in ("body",