| OLD | NEW |
| 1 # Copyright (c) 2006-2009 Mitch Garnaat http://garnaat.org/ | 1 # Copyright (c) 2006-2009 Mitch Garnaat http://garnaat.org/ |
| 2 # | 2 # |
| 3 # Permission is hereby granted, free of charge, to any person obtaining a | 3 # Permission is hereby granted, free of charge, to any person obtaining a |
| 4 # copy of this software and associated documentation files (the | 4 # copy of this software and associated documentation files (the |
| 5 # "Software"), to deal in the Software without restriction, including | 5 # "Software"), to deal in the Software without restriction, including |
| 6 # without limitation the rights to use, copy, modify, merge, publish, dis- | 6 # without limitation the rights to use, copy, modify, merge, publish, dis- |
| 7 # tribute, sublicense, and/or sell copies of the Software, and to permit | 7 # tribute, sublicense, and/or sell copies of the Software, and to permit |
| 8 # persons to whom the Software is furnished to do so, subject to the fol- | 8 # persons to whom the Software is furnished to do so, subject to the fol- |
| 9 # lowing conditions: | 9 # lowing conditions: |
| 10 # | 10 # |
| 11 # The above copyright notice and this permission notice shall be included | 11 # The above copyright notice and this permission notice shall be included |
| 12 # in all copies or substantial portions of the Software. | 12 # in all copies or substantial portions of the Software. |
| 13 # | 13 # |
| 14 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS | 14 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS |
| 15 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL- | 15 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL- |
| 16 # ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT | 16 # ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT |
| 17 # SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, | 17 # SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, |
| 18 # WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | 18 # WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
| 19 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS | 19 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS |
| 20 # IN THE SOFTWARE. | 20 # IN THE SOFTWARE. |
| 21 # | 21 # |
| 22 | 22 |
| 23 from .regioninfo import SDBRegionInfo | 23 from .regioninfo import SDBRegionInfo |
| 24 from boto.regioninfo import get_regions |
| 24 | 25 |
| 25 | 26 |
| 26 def regions(): | 27 def regions(): |
| 27 """ | 28 """ |
| 28 Get all available regions for the SDB service. | 29 Get all available regions for the SDB service. |
| 29 | 30 |
| 30 :rtype: list | 31 :rtype: list |
| 31 :return: A list of :class:`boto.sdb.regioninfo.RegionInfo` instances | 32 :return: A list of :class:`boto.sdb.regioninfo.RegionInfo` instances |
| 32 """ | 33 """ |
| 33 return [SDBRegionInfo(name='us-east-1', | 34 return get_regions( |
| 34 endpoint='sdb.amazonaws.com'), | 35 'sdb', |
| 35 SDBRegionInfo(name='eu-west-1', | 36 region_cls=SDBRegionInfo |
| 36 endpoint='sdb.eu-west-1.amazonaws.com'), | 37 ) |
| 37 SDBRegionInfo(name='us-west-1', | |
| 38 endpoint='sdb.us-west-1.amazonaws.com'), | |
| 39 SDBRegionInfo(name='sa-east-1', | |
| 40 endpoint='sdb.sa-east-1.amazonaws.com'), | |
| 41 SDBRegionInfo(name='us-west-2', | |
| 42 endpoint='sdb.us-west-2.amazonaws.com'), | |
| 43 SDBRegionInfo(name='ap-northeast-1', | |
| 44 endpoint='sdb.ap-northeast-1.amazonaws.com'), | |
| 45 SDBRegionInfo(name='ap-southeast-1', | |
| 46 endpoint='sdb.ap-southeast-1.amazonaws.com'), | |
| 47 SDBRegionInfo(name='ap-southeast-2', | |
| 48 endpoint='sdb.ap-southeast-2.amazonaws.com') | |
| 49 ] | |
| 50 | 38 |
| 51 | 39 |
| 52 def connect_to_region(region_name, **kw_params): | 40 def connect_to_region(region_name, **kw_params): |
| 53 """ | 41 """ |
| 54 Given a valid region name, return a | 42 Given a valid region name, return a |
| 55 :class:`boto.sdb.connection.SDBConnection`. | 43 :class:`boto.sdb.connection.SDBConnection`. |
| 56 | 44 |
| 57 :type: str | 45 :type: str |
| 58 :param region_name: The name of the region to connect to. | 46 :param region_name: The name of the region to connect to. |
| 59 | 47 |
| 60 :rtype: :class:`boto.sdb.connection.SDBConnection` or ``None`` | 48 :rtype: :class:`boto.sdb.connection.SDBConnection` or ``None`` |
| 61 :return: A connection to the given region, or None if an invalid region | 49 :return: A connection to the given region, or None if an invalid region |
| 62 name is given | 50 name is given |
| 63 """ | 51 """ |
| 64 for region in regions(): | 52 for region in regions(): |
| 65 if region.name == region_name: | 53 if region.name == region_name: |
| 66 return region.connect(**kw_params) | 54 return region.connect(**kw_params) |
| 67 return None | 55 return None |
| OLD | NEW |