Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(20)

Unified Diff: third_party/boto/boto/__init__.py

Issue 698893003: Update checked in version of gsutil to version 4.6 (Closed) Base URL: http://dart.googlecode.com/svn/third_party/gsutil/
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/boto/bin/sdbadmin ('k') | third_party/boto/boto/auth.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/boto/boto/__init__.py
===================================================================
--- third_party/boto/boto/__init__.py (revision 33376)
+++ third_party/boto/boto/__init__.py (working copy)
@@ -37,7 +37,7 @@
import urlparse
from boto.exception import InvalidUriError
-__version__ = '2.22.1'
+__version__ = '2.30.0'
Version = __version__ # for backware compatibility
# http://bugs.python.org/issue7980
@@ -58,6 +58,7 @@
GENERATION_RE = re.compile(r'(?P<versionless_uri_str>.+)'
r'#(?P<generation>[0-9]+)$')
VERSION_RE = re.compile('(?P<versionless_uri_str>.+)#(?P<version_id>.+)$')
+ENDPOINTS_PATH = os.path.join(os.path.dirname(__file__), 'endpoints.json')
def init_logging():
@@ -195,6 +196,11 @@
:rtype: :class:`boto.ec2.autoscale.AutoScaleConnection`
:return: A connection to Amazon's Auto Scaling Service
+
+ :type use_block_device_types bool
+ :param use_block_device_types: Specifies whether to return described Launch Configs with block device mappings containing
+ block device types, or a list of old style block device mappings (deprecated). This defaults to false for compatability
+ with the old incorrect style.
"""
from boto.ec2.autoscale import AutoScaleConnection
return AutoScaleConnection(aws_access_key_id, aws_secret_access_key,
@@ -311,6 +317,25 @@
return RDSConnection(aws_access_key_id, aws_secret_access_key, **kwargs)
+def connect_rds2(aws_access_key_id=None, aws_secret_access_key=None, **kwargs):
+ """
+ :type aws_access_key_id: string
+ :param aws_access_key_id: Your AWS Access Key ID
+
+ :type aws_secret_access_key: string
+ :param aws_secret_access_key: Your AWS Secret Access Key
+
+ :rtype: :class:`boto.rds2.layer1.RDSConnection`
+ :return: A connection to RDS
+ """
+ from boto.rds2.layer1 import RDSConnection
+ return RDSConnection(
+ aws_access_key_id=aws_access_key_id,
+ aws_secret_access_key=aws_secret_access_key,
+ **kwargs
+ )
+
+
def connect_emr(aws_access_key_id=None, aws_secret_access_key=None, **kwargs):
"""
:type aws_access_key_id: string
@@ -628,7 +653,7 @@
:type aws_secret_access_key: string
:param aws_secret_access_key: Your AWS Secret Access Key
- :rtype: :class:`boto.ec2.autoscale.CloudSearchConnection`
+ :rtype: :class:`boto.cloudsearch.layer2.Layer2`
:return: A connection to Amazon's CloudSearch service
"""
from boto.cloudsearch.layer2 import Layer2
@@ -636,6 +661,24 @@
**kwargs)
+def connect_cloudsearch2(aws_access_key_id=None,
+ aws_secret_access_key=None,
+ **kwargs):
+ """
+ :type aws_access_key_id: string
+ :param aws_access_key_id: Your AWS Access Key ID
+
+ :type aws_secret_access_key: string
+ :param aws_secret_access_key: Your AWS Secret Access Key
+
+ :rtype: :class:`boto.cloudsearch2.layer2.Layer2`
+ :return: A connection to Amazon's CloudSearch2 service
+ """
+ from boto.cloudsearch2.layer2 import Layer2
+ return Layer2(aws_access_key_id, aws_secret_access_key,
+ **kwargs)
+
+
def connect_beanstalk(aws_access_key_id=None,
aws_secret_access_key=None,
**kwargs):
« no previous file with comments | « third_party/boto/bin/sdbadmin ('k') | third_party/boto/boto/auth.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698