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

Unified Diff: third_party/boto/boto/iam/__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/https_connection.py ('k') | third_party/boto/boto/iam/connection.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/boto/boto/iam/__init__.py
===================================================================
--- third_party/boto/boto/iam/__init__.py (revision 33376)
+++ third_party/boto/boto/iam/__init__.py (working copy)
@@ -22,8 +22,8 @@
# this is here for backward compatibility
# originally, the IAMConnection class was defined here
-from connection import IAMConnection
-from boto.regioninfo import RegionInfo
+from boto.iam.connection import IAMConnection
+from boto.regioninfo import RegionInfo, get_regions
class IAMRegionInfo(RegionInfo):
@@ -50,18 +50,24 @@
:rtype: list
:return: A list of :class:`boto.regioninfo.RegionInfo` instances
"""
- return [IAMRegionInfo(name='universal',
- endpoint='iam.amazonaws.com',
- connection_cls=IAMConnection),
- IAMRegionInfo(name='us-gov-west-1',
- endpoint='iam.us-gov.amazonaws.com',
- connection_cls=IAMConnection),
- IAMRegionInfo(name='cn-north-1',
- endpoint='iam.cn-north-1.amazonaws.com.cn',
- connection_cls=IAMConnection)
- ]
+ regions = get_regions(
+ 'iam',
+ region_cls=IAMRegionInfo,
+ connection_cls=IAMConnection
+ )
+ # For historical reasons, we had a "universal" endpoint as well.
+ regions.append(
+ IAMRegionInfo(
+ name='universal',
+ endpoint='iam.amazonaws.com',
+ connection_cls=IAMConnection
+ )
+ )
+ return regions
+
+
def connect_to_region(region_name, **kw_params):
"""
Given a valid region name, return a
« no previous file with comments | « third_party/boto/boto/https_connection.py ('k') | third_party/boto/boto/iam/connection.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698