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

Unified Diff: third_party/boto/boto/s3/__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/boto/route53/zone.py ('k') | third_party/boto/boto/s3/acl.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/boto/boto/s3/__init__.py
===================================================================
--- third_party/boto/boto/s3/__init__.py (revision 33376)
+++ third_party/boto/boto/s3/__init__.py (working copy)
@@ -22,7 +22,7 @@
# IN THE SOFTWARE.
#
-from boto.regioninfo import RegionInfo
+from boto.regioninfo import RegionInfo, get_regions
class S3RegionInfo(RegionInfo):
@@ -50,37 +50,11 @@
:return: A list of :class:`boto.regioninfo.RegionInfo`
"""
from .connection import S3Connection
- return [S3RegionInfo(name='us-east-1',
- endpoint='s3.amazonaws.com',
- connection_cls=S3Connection),
- S3RegionInfo(name='us-gov-west-1',
- endpoint='s3-us-gov-west-1.amazonaws.com',
- connection_cls=S3Connection),
- S3RegionInfo(name='us-west-1',
- endpoint='s3-us-west-1.amazonaws.com',
- connection_cls=S3Connection),
- S3RegionInfo(name='us-west-2',
- endpoint='s3-us-west-2.amazonaws.com',
- connection_cls=S3Connection),
- S3RegionInfo(name='ap-northeast-1',
- endpoint='s3-ap-northeast-1.amazonaws.com',
- connection_cls=S3Connection),
- S3RegionInfo(name='ap-southeast-1',
- endpoint='s3-ap-southeast-1.amazonaws.com',
- connection_cls=S3Connection),
- S3RegionInfo(name='ap-southeast-2',
- endpoint='s3-ap-southeast-2.amazonaws.com',
- connection_cls=S3Connection),
- S3RegionInfo(name='eu-west-1',
- endpoint='s3-eu-west-1.amazonaws.com',
- connection_cls=S3Connection),
- S3RegionInfo(name='sa-east-1',
- endpoint='s3-sa-east-1.amazonaws.com',
- connection_cls=S3Connection),
- S3RegionInfo(name='cn-north-1',
- endpoint='s3.cn-north-1.amazonaws.com.cn',
- connection_cls=S3Connection),
- ]
+ return get_regions(
+ 's3',
+ region_cls=S3RegionInfo,
+ connection_cls=S3Connection
+ )
def connect_to_region(region_name, **kw_params):
« no previous file with comments | « third_party/boto/boto/route53/zone.py ('k') | third_party/boto/boto/s3/acl.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698