| Index: third_party/boto/boto/vpc/__init__.py
|
| ===================================================================
|
| --- third_party/boto/boto/vpc/__init__.py (revision 33376)
|
| +++ third_party/boto/boto/vpc/__init__.py (working copy)
|
| @@ -35,7 +35,7 @@
|
| from boto.vpc.subnet import Subnet
|
| from boto.vpc.vpnconnection import VpnConnection
|
| from boto.ec2 import RegionData
|
| -from boto.regioninfo import RegionInfo
|
| +from boto.regioninfo import RegionInfo, get_regions
|
|
|
|
|
| def regions(**kw_params):
|
| @@ -48,16 +48,7 @@
|
| :rtype: list
|
| :return: A list of :class:`boto.ec2.regioninfo.RegionInfo`
|
| """
|
| - regions = []
|
| - for region_name in RegionData:
|
| - region = RegionInfo(name=region_name,
|
| - endpoint=RegionData[region_name],
|
| - connection_cls=VPCConnection)
|
| - regions.append(region)
|
| - regions.append(RegionInfo(name='us-gov-west-1',
|
| - endpoint=RegionData[region_name],
|
| - connection_cls=VPCConnection))
|
| - return regions
|
| + return get_regions('ec2', connection_cls=VPCConnection)
|
|
|
|
|
| def connect_to_region(region_name, **kw_params):
|
| @@ -1125,7 +1116,7 @@
|
|
|
| - *state*, a list of states of the Subnet
|
| (pending,available)
|
| - - *vpcId*, a list of IDs of teh VPC the subnet is in.
|
| + - *vpcId*, a list of IDs of the VPC that the subnet is in.
|
| - *cidrBlock*, a list of CIDR blocks of the subnet
|
| - *availabilityZone*, list of the Availability Zones
|
| the subnet is in.
|
|
|