boto/__init__.py - Issue 8386013: Merging in latest boto.

Unified Diff: boto/init.py

Issue 8386013: Merging in latest boto. (Closed) Base URL: svn://svn.chromium.org/boto

Patch Set: Redoing vendor drop by deleting and then merging. Created 9 years, 2 months 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

Index: boto/__init__.py

diff --git a/boto/__init__.py b/boto/__init__.py

index d11b5789bdde624bed5dfa8852d44f097f7067aa..00e2fc8720917b5803267d45dd97090463ca4448 100644

--- a/boto/__init__.py

+++ b/boto/__init__.py

@@ -1,5 +1,6 @@

# Permission is hereby granted, free of charge, to any person obtaining a

@@ -21,7 +22,6 @@

# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS

# IN THE SOFTWARE.

-import boto

from boto.pyami.config import Config, BotoConfigLocations

from boto.storage_uri import BucketStorageUri, FileStorageUri

import boto.plugin

@@ -30,7 +30,7 @@ import logging

import logging.config

from boto.exception import InvalidUriError

-__version__ = '2.0b4'

+__version__ = '2.1.1'

Version = __version__ # for backware compatibility

UserAgent = 'Boto/%s (%s)' % (__version__, sys.platform)

@@ -109,10 +109,10 @@ def connect_s3(aws_access_key_id=None, aws_secret_access_key=None, **kwargs):

def connect_gs(gs_access_key_id=None, gs_secret_access_key=None, **kwargs):

"""

@type gs_access_key_id: string

- @param gs_access_key_id: Your Google Storage Access Key ID

+ @param gs_access_key_id: Your Google Cloud Storage Access Key ID

@type gs_secret_access_key: string

- @param gs_secret_access_key: Your Google Storage Secret Access Key

+ @param gs_secret_access_key: Your Google Cloud Storage Secret Access Key

@rtype: L{GSConnection<boto.gs.connection.GSConnection>}

@return: A connection to Google's Storage service

@@ -264,10 +264,10 @@ def connect_emr(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.emr.EmrConnection`

:return: A connection to Elastic mapreduce

"""

@@ -317,7 +317,7 @@ def connect_route53(aws_access_key_id=None, aws_secret_access_key=None, **kwargs

from boto.route53 import Route53Connection

return Route53Connection(aws_access_key_id, aws_secret_access_key, **kwargs)

-def connect_euca(host, aws_access_key_id=None, aws_secret_access_key=None,

+def connect_euca(host=None, aws_access_key_id=None, aws_secret_access_key=None,

port=8773, path='/services/Eucalyptus', is_secure=False,

**kwargs):

"""

@@ -325,7 +325,7 @@ def connect_euca(host, aws_access_key_id=None, aws_secret_access_key=None,

:type host: string

:param host: the host name or ip address of the Eucalyptus server

:type aws_access_key_id: string

:param aws_access_key_id: Your AWS Access Key ID

@@ -338,12 +338,24 @@ def connect_euca(host, aws_access_key_id=None, aws_secret_access_key=None,

from boto.ec2 import EC2Connection

from boto.ec2.regioninfo import RegionInfo

+ # Check for values in boto config, if not supplied as args

+ if not aws_access_key_id:

+ aws_access_key_id = config.get('Credentials',

+ 'euca_access_key_id',

+ None)

+ if not aws_secret_access_key:

+ aws_secret_access_key = config.get('Credentials',

+ 'euca_secret_access_key',

+ None)

+ if not host:

+ host = config.get('Boto', 'eucalyptus_host', None)

reg = RegionInfo(name='eucalyptus', endpoint=host)

return EC2Connection(aws_access_key_id, aws_secret_access_key,

region=reg, port=port, path=path,

is_secure=is_secure, **kwargs)

-def connect_walrus(host, aws_access_key_id=None, aws_secret_access_key=None,

+def connect_walrus(host=None, aws_access_key_id=None, aws_secret_access_key=None,

port=8773, path='/services/Walrus', is_secure=False,

**kwargs):

"""

@@ -351,7 +363,7 @@ def connect_walrus(host, aws_access_key_id=None, aws_secret_access_key=None,

:type host: string

:param host: the host name or ip address of the Walrus server

:type aws_access_key_id: string

:param aws_access_key_id: Your AWS Access Key ID

@@ -364,6 +376,18 @@ def connect_walrus(host, aws_access_key_id=None, aws_secret_access_key=None,

from boto.s3.connection import S3Connection

from boto.s3.connection import OrdinaryCallingFormat

+ # Check for values in boto config, if not supplied as args

+ if not aws_access_key_id:

+ aws_access_key_id = config.get('Credentials',

+ 'euca_access_key_id',

+ None)

+ if not aws_secret_access_key:

+ aws_secret_access_key = config.get('Credentials',

+ 'euca_secret_access_key',

+ None)

+ if not host:

+ host = config.get('Boto', 'walrus_host', None)

return S3Connection(aws_access_key_id, aws_secret_access_key,

host=host, port=port, path=path,

calling_format=OrdinaryCallingFormat(),

@@ -383,6 +407,20 @@ def connect_ses(aws_access_key_id=None, aws_secret_access_key=None, **kwargs):

from boto.ses import SESConnection

return SESConnection(aws_access_key_id, aws_secret_access_key, **kwargs)

+def connect_sts(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.sts.STSConnection`

+ :return: A connection to Amazon's STS

+ """

+ from boto.sts import STSConnection

+ return STSConnection(aws_access_key_id, aws_secret_access_key, **kwargs)

def connect_ia(ia_access_key_id=None, ia_secret_access_key=None,

is_secure=False, **kwargs):

"""

@@ -394,9 +432,10 @@ def connect_ia(ia_access_key_id=None, ia_secret_access_key=None,

section called "ia_access_key_id"

:type ia_secret_access_key: string

- :param ia_secret_access_key: Your IA Secret Access Key. This will also look in your

- boto config file for an entry in the Credentials

- section called "ia_secret_access_key"

+ :param ia_secret_access_key: Your IA Secret Access Key. This will also

+ look in your boto config file for an entry

+ in the Credentials section called

+ "ia_secret_access_key"

:rtype: :class:`boto.s3.connection.S3Connection`

:return: A connection to the Internet Archive

@@ -506,7 +545,10 @@ def storage_uri(uri_str, default_scheme='file', debug=0, validate=True,

if scheme == 'file':

# For file URIs we have no bucket name, and use the complete path

# (minus 'file://') as the object name.

- return FileStorageUri(path, debug)

+ is_stream = False

+ if path == '-':

+ is_stream = True

+ return FileStorageUri(path, debug, is_stream)

else:

path_parts = path.split('/', 1)

bucket_name = path_parts[0]

« no previous file with comments | « bin/s3put ('k') | boto/auth.py » ('j') | no next file with comments »

Unified Diff: boto/__init__.py

Unified Diff: boto/init.py