Merge branch 'develop' of https://github.com/boto/boto into develop

boto/gs/resumable_upload_handler.py

@@ -163,6 +163,22 @@ def get_tracker_uri(self):
         """
         return self.tracker_uri
 
+    def get_upload_id(self):
+        """
+        Returns the upload ID for the resumable upload, or None if the upload
+        has not yet started.
+        """
+        # We extract the upload_id from the tracker uri. We could retrieve the
+        # upload_id from the headers in the response but this only works for
+        # the case where we get the tracker uri from the service. In the case
+        # where we get the tracker from the tracking file we need to do this
+        # logic anyway.
+        delim = '?upload_id='
+        if self.tracker_uri and delim in self.tracker_uri:
+          return uri[uri.index(delim) + len(delim):]
+        else:
+          return None
+
     def _remove_tracker_file(self):
         if (self.tracker_file_name and
             os.path.exists(self.tracker_file_name)):

boto/storage_uri.py

@@ -304,13 +304,15 @@ def _update_from_key(self, key):
       self._update_from_values(
           getattr(key, 'version_id', None),
           getattr(key, 'generation', None),
-          getattr(key, 'is_latest', None))
+          getattr(key, 'is_latest', None),
+          getattr(key, 'md5', None))
 
-    def _update_from_values(self, version_id, generation, is_latest):
+    def _update_from_values(self, version_id, generation, is_latest, md5):
       self.version_id = version_id
       self.generation = generation
       self.is_latest = is_latest
       self._build_uri_strings()
+      self.md5 = md5
 
     def get_key(self, validate=False, headers=None, version_id=None):
         self._check_object_uri('get_key')
@@ -652,7 +654,7 @@ def set_contents_from_file(self, fp, headers=None, replace=True, cb=None,
                 rewind=rewind, res_upload_handler=res_upload_handler)
             if res_upload_handler:
                 self._update_from_values(None, res_upload_handler.generation,
-                                         None)
+                                         None, md5)
         else:
             self._warn_about_args('set_contents_from_file',
                                   res_upload_handler=res_upload_handler)

docs/source/boto_config_tut.rst

@@ -11,8 +11,8 @@ There is a growing list of configuration options for the boto library. Many of
 these options can be passed into the constructors for top-level objects such as
 connections. Some options, such as credentials, can also be read from
 environment variables (e.g. ``AWS_ACCESS_KEY_ID`` and ``AWS_SECRET_ACCESS_KEY``).
-But there is no central place to manage these options. So, the development
-version of boto has now introduced the notion of boto config files.
+It is also possible to manage these options in a central place through the use
+of boto config files.
 
 Details
 -------
@@ -50,7 +50,7 @@ boto requests. The order of precedence for authentication credentials is:
 * Credentials specified as options in the config file.
 
 This section defines the following options: ``aws_access_key_id`` and
-``aws_secret_access_key``. The former being your aws key id and the latter
+``aws_secret_access_key``. The former being your AWS key id and the latter
 being the secret key.
 
 For example::
@@ -60,7 +60,7 @@ For example::
     aws_secret_access_key = <your secret key>
 
 Please notice that quote characters are not used to either side of the '='
-operator even when both your aws access key id and secret key are strings.
+operator even when both your AWS access key id and secret key are strings.
 
 For greater security, the secret key can be stored in a keyring and
 retrieved via the keyring package.  To use a keyring, use ``keyring``,
@@ -76,11 +76,22 @@ Python path. To learn about setting up keyrings, see the `keyring
 documentation
 <http://pypi.python.org/pypi/keyring#installing-and-using-python-keyring-lib>`_
 
+Credentials can also be supplied for a Eucalyptus service::
+
+    [Credentials]
+    euca_access_key_id = <your access key>
+    euca_secret_access_key = <your secret key>
+
+Finally, this section is also be used to provide credentials for the Internet Archive API::
+
+    [Credentials]
+    ia_access_key_id = <your access key>
+    ia_secret_access_key = <your secret key>
 
 Boto
 ^^^^
 
-The Boto section is used to specify options that control the operaton of
+The Boto section is used to specify options that control the operation of
 boto itself. This section defines the following options:
 
 :debug: Controls the level of debug messages that will be printed by the boto library.
@@ -99,7 +110,7 @@ boto itself. This section defines the following options:
   request. The default number of retries is 5 but you can change the default
   with this option.
 
-As an example::
+For example::
 
     [Boto]
     debug = 0
@@ -110,6 +121,136 @@ As an example::
     proxy_user = foo
     proxy_pass = bar
 
+
+:connection_stale_duration: Amount of time to wait in seconds before a
+  connection will stop getting reused. AWS will disconnect connections which
+  have been idle for 180 seconds.
+:is_secure: Is the connection over SSL. This setting will overide passed in
+  values.
+:https_validate_certificates: Validate HTTPS certificates. This is on by default
+:ca_certificates_file: Location of CA certificates
+:http_socket_timeout: Timeout used to overwrite the system default socket
+  timeout for httplib .
+:send_crlf_after_proxy_auth_headers: Change line ending behaviour with proxies.
+  For more details see this `discussion <https://groups.google.com/forum/?fromgroups=#!topic/boto-dev/teenFvOq2Cc>`_
+
+These settings will default to::
+
+    [Boto]
+    connection_stale_duration = 180
+    is_secure = True
+    https_validate_certificates = True
+    ca_certificates_file = cacerts.txt
+    http_socket_timeout=60
+    send_crlf_after_proxy_auth_headers = False
+
+This section is also used for specifying endpoints for non-AWS services such as
+Eucalyptus and Walrus.
+
+:eucalyptus_host: Select a default endpoint host for eucalyptus
+:walrus_host: Select a default host for Walrus 
+
+For example::
+
+    [Boto]
+    eucalyptus_host = somehost.example.com
+    walrus_host = somehost.example.com
+
+
+Finally, the Boto section is used to set defaults versions for many AWS services
+
+AutoScale settings:
+
+options:
+:autoscale_version: Set the API version
+:autoscale_endpoint: Endpoint to use
+:autoscale_region_name: Default region to use
+
+For example::
+
+    [Boto]
+    autoscale_version = 2011-01-01
+    autoscale_endpoint = autoscaling.us-east-1.amazonaws.com
+    autoscale_region_name = us-east-1
+
+
+Cloudformation settings can also be defined:
+
+:cfn_version: Cloud formation API version
+:cfn_region_name: Default region name
+:cfn_region_endpoint: Default endpoint
+
+For example::
+
+    [Boto]
+    cfn_version = 2010-05-15
+    cfn_region_name = us-east-1
+    cfn_region_endpoint = cloudformation.us-east-1.amazonaws.com
+
+Cloudsearch settings:
+
+:cs_region_name: Default cloudsearch region
+:cs_region_endpoint: Default cloudsearch endpoint
+
+For example::
+
+    [Boto]
+    cs_region_name = us-east-1
+    cs_region_endpoint = cloudsearch.us-east-1.amazonaws.com
+
+Cloudwatch settings:
+
+:cloudwatch_version: Cloudwatch API version
+:cloudwatch_region_name: Default region name
+:cloudwatch_region_endpoint: Default endpoint
+
+For example::
+
+    [Boto]
+    cloudwatch_version = 2010-08-01
+    cloudwatch_region_name = us-east-1
+    cloudwatch_region_endpoint = monitoring.us-east-1.amazonaws.com
+
+EC2 settings:
+
+:ec2_version: EC2 API version
+:ec2_region_name: Default region name
+:ec2_region_endpoint: Default endpoint
+
+For example::
+
+    [Boto]
+    ec2_version = 2012-12-01
+    ec2_region_name = us-east-1
+    ec2_region_endpoint = ec2.us-east-1.amazonaws.com
+
+ELB settings:
+
+:elb_version: ELB API version
+:elb_region_name: Default region name
+:elb_region_endpoint: Default endpoint
+
+For example::
+
+    [Boto]
+    elb_version = 2012-06-01
+    elb_region_name = us-east-1
+    elb_region_endpoint = elasticloadbalancing.us-east-1.amazonaws.com
+
+EMR settings:
+
+:emr_version: EMR API version
+:emr_region_name: Default region name
+:emr_region_endpoint: Default endpoint
+
+For example::
+
+    [Boto]
+    emr_version = 2009-03-31
+    emr_region_name = us-east-1
+    emr_region_endpoint = elasticmapreduce.us-east-1.amazonaws.com
+    
+
 Precedence
 ----------
 
@@ -126,3 +267,110 @@ In these cases where these options can be found in more than one place boto
 will first use the explicitly supplied arguments, if none found it will then
 look for them amidst environment variables and if that fails it will use the
 ones in boto config.
+
+Notification
+^^^^^^^^^^^^
+
+If you are using notifications for boto.pyami, you can specify the email
+details through the following variables.
+
+:smtp_from: Used as the sender in notification emails.
+:smtp_to: Destination to which emails should be sent
+:smtp_host: Host to connect to when sending notification emails.
+:smtp_port: Port to connect to when connecting to the :smtp_host:
+
+Default values are::
+
+    [notification]
+    smtp_from = boto
+    smtp_to = None
+    smtp_host = localhost
+    smtp_port = 25
+    smtp_tls = True
+    smtp_user = john
+    smtp_pass = hunter2
+
+SWF
+^^^
+
+The SWF section allows you to configure the default region to be used for the
+Amazon Simple Workflow service.
+
+:region: Set the default region
+
+Example::
+
+    [SWF]
+    region = us-east-1
+
+Pyami
+^^^^^
+
+The Pyami section is used to configure the working directory for PyAMI.
+
+:working_dir: Working directory used by PyAMI
+
+Example::
+
+    [Pyami]
+    working_dir = /home/foo/
+
+DB
+^^
+The DB section is used to configure access to databases through the
+:func:`boto.sdb.db.manager.get_manager` function. 
+
+:db_type: Type of the database. Current allowed values are `SimpleDB` and
+    `XML`.
+:db_user: AWS access key id.
+:db_passwd: AWS secret access key.
+:db_name: Database that will be connected to.
+:db_table: Table name :note: This doesn't appear to be used.
+:db_host: Host to connect to
+:db_port: Port to connect to
+:enable_ssl: Use SSL
+
+More examples::
+
+    [DB]
+    db_type = SimpleDB
+    db_user = <aws access key id>
+    db_passwd = <aws secret access key>
+    db_name = my_domain
+    db_table = table
+    db_host = sdb.amazonaws.com
+    enable_ssl = True
+    debug = True
+
+    [DB_TestBasic]
+    db_type = SimpleDB
+    db_user = <another aws access key id>
+    db_passwd = <another aws secret access key>
+    db_name = basic_domain
+    db_port = 1111
+
+SDB
+^^^
+
+This section is used to configure SimpleDB
+
+:region: Set the region to which SDB should connect
+
+Example::
+
+    [SDB]
+    region = us-east-1
+
+DynamoDB
+^^^^^^^^
+
+This section is used to configure DynamoDB
+
+:region: Choose the default region
+:validate_checksums: Check checksums returned by DynamoDB
+
+Example::
+
+    [DynamoDB]
+    region = us-east-1
+    validate_checksums = True

requirements.txt

@@ -1,5 +1,5 @@
 mock==1.0.1
-nose==1.1.2
+nose==1.2.1
 requests==0.13.1
 rsa==3.1.1
 tox==1.4

tests/integration/gs/test_versioning.py

@@ -64,8 +64,7 @@ def testDeleteVersionedKey(self):
 
         # Delete "current" version and make sure that version is no longer
         # visible from a basic GET call.
-        k = b.get_key("foo")
-        k.delete()
+        b.delete_key("foo", generation=None)
         self.assertIsNone(b.get_key("foo"))
 
         # Both old versions should still be there when listed using the versions