Removes BROKER_INSIST option

dmtaub · Jul 23, 2012 · 59cf4f7 · 59cf4f7
1 parent fa52fa9
commit 59cf4f7
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 10 deletions.
diff --git a/celery/app/base.py b/celery/app/base.py
@@ -192,10 +192,9 @@ def send_task(self, name, args=None, kwargs=None, countdown=None,
                         countdown=countdown, eta=eta,
                         expires=expires, **options))
 
-    def connection(self, hostname=None, userid=None,
-            password=None, virtual_host=None, port=None, ssl=None,
-            insist=None, connect_timeout=None, transport=None,
-            transport_options=None, **kwargs):
+    def connection(self, hostname=None, userid=None, password=None,
+            virtual_host=None, port=None, ssl=None, connect_timeout=None,
+            transport=None, transport_options=None, **kwargs):
         conf = self.conf
         return self.amqp.Connection(
                     hostname or conf.BROKER_HOST,
@@ -204,7 +203,6 @@ def connection(self, hostname=None, userid=None,
                     virtual_host or conf.BROKER_VHOST,
                     port or conf.BROKER_PORT,
                     transport=transport or conf.BROKER_TRANSPORT,
-                    insist=self.either('BROKER_INSIST', insist),
                     ssl=self.either('BROKER_USE_SSL', ssl),
                     connect_timeout=self.either(
                                 'BROKER_CONNECTION_TIMEOUT', connect_timeout),

diff --git a/celery/app/defaults.py b/celery/app/defaults.py
@@ -69,8 +69,6 @@ def __repr__(self):
         'CONNECTION_RETRY': Option(True, type='bool'),
         'CONNECTION_MAX_RETRIES': Option(100, type='int'),
         'POOL_LIMIT': Option(10, type='int'),
-        'INSIST': Option(False, type='bool',
-                         deprecate_by='2.4', remove_by='4.0'),
         'USE_SSL': Option(False, type='bool'),
         'TRANSPORT': Option(type='string'),
         'TRANSPORT_OPTIONS': Option({}, type='dict'),

diff --git a/celery/tests/app/test_defaults.py b/celery/tests/app/test_defaults.py
@@ -33,7 +33,7 @@ def test_default_pool_pypy_15(self):
 
     def test_deprecated(self):
         source = Mock()
-        source.BROKER_INSIST = True
+        source.CELERYD_LOG_LEVEL = 2
         with patch('celery.utils.warn_deprecated') as warn:
             self.defaults.find_deprecated_settings(source)
             self.assertTrue(warn.called)

diff --git a/docs/internals/deprecation.rst b/docs/internals/deprecation.rst
@@ -201,7 +201,6 @@ Settings
 ``BROKER_USER``                        :setting:`BROKER_URL`
 ``BROKER_PASSWORD``                    :setting:`BROKER_URL`
 ``BROKER_VHOST``                       :setting:`BROKER_URL`
-``BROKER_INSIST``                      *no alternative*
 =====================================  =====================================
 
 

diff --git a/extra/release/verify_config_reference.py b/extra/release/verify_config_reference.py
@@ -6,7 +6,6 @@
 from celery.app.defaults import NAMESPACES, flatten
 
 ignore = frozenset([
-    "BROKER_INSIST",
     "CELERYD_POOL_PUTLOCKS",
     "BROKER_HOST",
     "BROKER_USER",