Merge pull request jegesh#38 from hjpotter92/patch-1

Make the SqlLauncher more pythonic.
hjpotter92 · Jul 5, 2020 · 295dfc2 · 295dfc2
2 parents d08b8df + 66a21a9
commit 295dfc2
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/sqs_launcher/__init__.py b/sqs_launcher/__init__.py
@@ -38,7 +38,7 @@ def __init__(self, queue=None, queue_url=None, create_queue=False, visibility_ti
                                     to finish execution. See http://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-visibility-timeout.html
                                     for more information
         """
-        if not queue and not queue_url:
+        if not any(queue, queue_url):
             raise ValueError('Either `queue` or `queue_url` should be provided.')
         if (not os.environ.get('AWS_ACCOUNT_ID', None) and
                 not (boto3.Session().get_credentials().method in ['iam-role', 'assume-role'])):
@@ -81,15 +81,10 @@ def launch_message(self, message, **kwargs):
         :return: (dict) the message response from SQS
         """
         sqs_logger.info("Sending message to queue " + self._queue_name)
-        if not kwargs:
-            return self._client.send_message(
-                QueueUrl=self._queue_url,
-                MessageBody=json.dumps(message)
-            )
         return self._client.send_message(
             QueueUrl=self._queue_url,
             MessageBody=json.dumps(message),
-            **kwargs
+            **kwargs,
         )
 
     def _get_queue_name_from_url(self, url):