Pull in upstream boto from github at bcb719937de9ac2851e632d62b777352029a6d55

boto/sqs/connection.py

 # Copyright (c) 2006-2009 Mitch Garnaat http://garnaat.org/
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
 # without limitation the rights to use, copy, modify, merge, publish, dis-
 # tribute, sublicense, and/or sell copies of the Software, and to permit
 # persons to whom the Software is furnished to do so, subject to the fol-
 # lowing conditions:
 #
@@ skipping 15 matching lines @@
 from boto.sqs.attributes import Attributes
 from boto.exception import SQSError
 
 
 class SQSConnection(AWSQueryConnection):
     """
     A Connection to the SQS Service.
     """
     DefaultRegionName = 'us-east-1'
     DefaultRegionEndpoint = 'queue.amazonaws.com'
-    APIVersion = '2009-02-01'
+    APIVersion = '2011-10-01'
     DefaultContentType = 'text/plain'
     ResponseError = SQSError
-    
+
     def __init__(self, aws_access_key_id=None, aws_secret_access_key=None,
                  is_secure=True, port=None, proxy=None, proxy_port=None,
                  proxy_user=None, proxy_pass=None, debug=0,
                  https_connection_factory=None, region=None, path='/',
                  security_token=None):
         if not region:
             region = SQSRegionInfo(self, self.DefaultRegionName,
                                    self.DefaultRegionEndpoint)
         self.region = region
         AWSQueryConnection.__init__(self, aws_access_key_id,
@@ skipping 28 matching lines @@
         :param visibility_timeout: The default visibility timeout for all
                                    messages written in the queue.  This can
                                    be overridden on a per-message.
 
         :rtype: :class:`boto.sqs.queue.Queue`
         :return: The newly created queue.
 
         """
         params = {'QueueName': queue_name}
         if visibility_timeout:
-            params['DefaultVisibilityTimeout'] = '%d' % (visibility_timeout,)
+            params['Attribute.1.Name'] = 'VisibilityTimeout'
+            params['Attribute.1.Value'] = int(visibility_timeout)
         return self.get_object('CreateQueue', params, Queue)
 
     def delete_queue(self, queue, force_deletion=False):
         """
         Delete an SQS Queue.
 
         :type queue: A Queue object
         :param queue: The SQS queue to be deleted
         
         :type force_deletion: Boolean
@@ skipping 104 matching lines @@
         
         :type receipt_handle: str
         :param receipt_handle: The receipt handle for the message
         
         :rtype: bool
         :return: True if successful, False otherwise.
         """
         params = {'ReceiptHandle' : receipt_handle}
         return self.get_status('DeleteMessage', params, queue.id)
 
-    def send_message(self, queue, message_content):
+    def send_message(self, queue, message_content, delay_seconds=None):
         params = {'MessageBody' : message_content}
+        if delay_seconds:
+            params['DelaySeconds'] = int(delay_seconds)
         return self.get_object('SendMessage', params, Message,
                                queue.id, verb='POST')
 
     def change_message_visibility(self, queue, receipt_handle,
                                   visibility_timeout):
         """
         Extends the read lock timeout for the specified message from
         the specified queue to the specified value.
 
         :type queue: A :class:`boto.sqs.queue.Queue` object
         :param queue: The Queue from which messages are read.
         
         :type receipt_handle: str
         :param queue: The receipt handle associated with the message whose
                       visibility timeout will be changed.
         
         :type visibility_timeout: int
         :param visibility_timeout: The new value of the message's visibility
                                    timeout in seconds.
         """
         params = {'ReceiptHandle' : receipt_handle,
                   'VisibilityTimeout' : visibility_timeout}
         return self.get_status('ChangeMessageVisibility', params, queue.id)
 
     def get_all_queues(self, prefix=''):
         params = {}
         if prefix:
             params['QueueNamePrefix'] = prefix
         return self.get_list('ListQueues', params, [('QueueUrl', Queue)])
-        
+
     def get_queue(self, queue_name):
         rs = self.get_all_queues(queue_name)
         for q in rs:
             if q.url.endswith(queue_name):
                 return q
         return None
 
     lookup = get_queue
 
     #
@@ skipping 43 matching lines @@
         :type label: str or unicode
         :param label: The unique label associated with the permission
                       being removed.
 
         :rtype: bool
         :return: True if successful, False otherwise.
         """
         params = {'Label': label}
         return self.get_status('RemovePermission', params, queue.id)
 
-    
-    
 
-    
+
+
+