diff --git a/kombu/tests/transport/test_transport.py b/kombu/tests/transport/test_transport.py index 06127b10..2f7d2ede 100644 --- a/kombu/tests/transport/test_transport.py +++ b/kombu/tests/transport/test_transport.py @@ -32,13 +32,3 @@ class test_transport(Case): def test_resolve_transport_alias(self): self.assertTrue(transport.resolve_transport('pyamqp')) - - -class test_transport_ghettoq(Case): - - @patch('warnings.warn') - def test_compat(self, warn): - x = transport._ghettoq('Redis', 'redis', 'redis') - - self.assertEqual(x(), 'kombu.transport.redis.Transport') - warn.assert_called() diff --git a/kombu/transport/__init__.py b/kombu/transport/__init__.py index 64cff67b..23c02b32 100644 --- a/kombu/transport/__init__.py +++ b/kombu/transport/__init__.py @@ -22,26 +22,6 @@ def supports_librabbitmq(): return True -def _ghettoq(name, new, alias=None): - xxx = new # stupid enclosing - - def __inner(): - import warnings - _new = callable(xxx) and xxx() or xxx - gtransport = 'ghettoq.taproot.{0}'.format(name) - ktransport = 'kombu.transport.{0}.Transport'.format(_new) - this = alias or name - warnings.warn(""" - Ghettoq does not work with Kombu, but there is now a built-in version - of the {0} transport. - - You should replace {1!r} with: {2!r} - """.format(name, gtransport, this)) - return ktransport - - return __inner - - TRANSPORT_ALIASES = { 'amqp': 'kombu.transport.pyamqp:Transport', 'pyamqp': 'kombu.transport.pyamqp:Transport', @@ -57,11 +37,6 @@ TRANSPORT_ALIASES = { 'django': 'kombu.transport.django:Transport', 'SLMQ': 'kombu.transport.SLMQ.Transport', 'slmq': 'kombu.transport.SLMQ.Transport', - 'ghettoq.taproot.Redis': _ghettoq('Redis', 'redis', 'redis'), - 'ghettoq.taproot.Database': _ghettoq('Database', 'django', 'django'), - 'ghettoq.taproot.MongoDB': _ghettoq('MongoDB', 'mongodb'), - 'ghettoq.taproot.Beanstalk': _ghettoq('Beanstalk', 'beanstalk'), - 'ghettoq.taproot.CouchDB': _ghettoq('CouchDB', 'couchdb'), 'filesystem': 'kombu.transport.filesystem:Transport', 'zeromq': 'kombu.transport.zmq:Transport', 'zmq': 'kombu.transport.zmq:Transport',