diff --git a/glacier/GlacierWrapper.py b/glacier/GlacierWrapper.py index a2cb57b..b06902f 100755 --- a/glacier/GlacierWrapper.py +++ b/glacier/GlacierWrapper.py @@ -2,7 +2,7 @@ """ .. module:: GlacierWrapper :platform: Unix, Windows - :synopsis: Wrapper for accessing Amazon Glacier, with Amazon SimpleDB + :synopsis: Wrapper for accessing Amazon Glacier, with Amazon SimpleDB support and other features. """ @@ -113,12 +113,13 @@ class GlacierWrapper(object): MAX_VAULT_NAME_LENGTH = 255 MAX_VAULT_DESCRIPTION_LENGTH = 1024 MAX_PARTS = 10000 - AVAILABLE_REGIONS = ('us-east-1', 'us-west-2', 'us-west-1', + AVAILABLE_REGIONS = ('us-east-1', 'us-east-2', 'us-west-2', 'us-west-1', 'eu-west-1', 'eu-central-1', 'sa-east-1', - 'ap-northeast-1', 'ap-southeast-1', 'ap-southeast-2') + 'ap-northeast-1', 'ap-southeast-1', 'ap-southeast-2', 'ap-south-1') AVAILABLE_REGIONS_MESSAGE = """\ Invalid region. Available regions for Amazon Glacier are: us-east-1 (US - Virginia) +us-east-2 (US - Ohio) us-west-1 (US - N. California) us-west-2 (US - Oregon) eu-west-1 (EU - Ireland) @@ -126,7 +127,8 @@ class GlacierWrapper(object): sa-east-1 (South America - Sao Paulo) ap-northeast-1 (Asia-Pacific - Tokyo) ap-southeast-1 (Asia Pacific (Singapore) -ap-southeast-2 (Asia-Pacific - Sydney)\ +ap-southeast-2 (Asia-Pacific - Sydney) +ap-south-1 (Asia-Pacific - Mumbai)\ """ def setuplogging(self, logfile, loglevel, logtostdout): @@ -1854,7 +1856,7 @@ def sns_subscribe(self, protocol, endpoint, topic, sns_options, vault_names=None if vault_names: vaults = vault_names.split(",") self._init_events_for_vaults(vaults, topic_arn) - + topic_arns = [topic_arn] if len(topic_arns): @@ -1876,7 +1878,7 @@ def sns_subscribe(self, protocol, endpoint, topic, sns_options, vault_names=None @sns_connect def sns_list_topics(self, sns_options): topics = self.sns_conn.get_all_topics()['ListTopicsResponse']['ListTopicsResult']['Topics'] - + results = [] for topic in topics: results += [{"Topic":topic['TopicArn'].split(":")[-1], "Topic ARN":topic['TopicArn']}]