Merge pull request #30 from cuda-networks/execute_inline_bugfix

make sure kwarg is popped in any case
cuda-networks · Oct 30, 2018 · d3928f7 · d3928f7
2 parents f3ebd51 + 70dcbb0
commit d3928f7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/eb_sqs/decorators.py b/eb_sqs/decorators.py
@@ -18,7 +18,7 @@ def wrapper(*args, **kwargs):
         max_retries = _get_kwarg_val(kwargs, 'max_retries', max_retries_count if max_retries_count else settings.DEFAULT_MAX_RETRIES)
         pickle = _get_kwarg_val(kwargs, 'use_pickle', use_pickle if use_pickle else settings.USE_PICKLE)
 
-        execute_inline = True if settings.EXECUTE_INLINE else _get_kwarg_val(kwargs, 'execute_inline', False)
+        execute_inline = _get_kwarg_val(kwargs, 'execute_inline', False) or settings.EXECUTE_INLINE
         delay = _get_kwarg_val(kwargs, 'delay',  settings.DEFAULT_DELAY)
         group_id = _get_kwarg_val(kwargs, 'group_id', None)
 
@@ -32,7 +32,7 @@ def func_retry_decorator(worker_task):
     # type: (WorkerTask) -> (tuple, dict)
     def wrapper(*args, **kwargs):
         # type: (tuple, dict) -> Any
-        execute_inline = True if settings.EXECUTE_INLINE else _get_kwarg_val(kwargs, 'execute_inline', False)
+        execute_inline = _get_kwarg_val(kwargs, 'execute_inline', False) or settings.EXECUTE_INLINE
         delay = _get_kwarg_val(kwargs, 'delay', settings.DEFAULT_DELAY)
         count_retries = _get_kwarg_val(kwargs, 'count_retries', settings.DEFAULT_COUNT_RETRIES)
 

diff --git a/setup.py b/setup.py
@@ -6,7 +6,7 @@
 
 setup(
     name='django-eb-sqs',
-    version='1.11',
+    version='1.12',
     package_dir={'eb_sqs': 'eb_sqs'},
     include_package_data=True,
     packages=find_packages(),