summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Parslow <tom@almostobsolete.net>2012-09-05 09:51:50 +0100
committerThomas Parslow <tom@almostobsolete.net>2012-09-05 09:51:50 +0100
commit95101f28c303ce0283534d3e2b80d68246475b89 (patch)
tree2710515f33b5585d0228eebbbc4f95376a6a26c3
parent2366031152e77e4565e98f003e5815801f2c1601 (diff)
downloadboto-95101f28c303ce0283534d3e2b80d68246475b89.tar.gz
Archive retrieval job should not include a format (that's for listing operations)
-rw-r--r--boto/glacier/vault.py9
1 files changed, 2 insertions, 7 deletions
diff --git a/boto/glacier/vault.py b/boto/glacier/vault.py
index f3874d87..e691e143 100644
--- a/boto/glacier/vault.py
+++ b/boto/glacier/vault.py
@@ -136,7 +136,7 @@ class Vault(object):
return writer.get_archive_id()
def retrieve_archive(self, archive_name, sns_topic=None,
- description=None, format='JSON'):
+ description=None):
"""
Initiate a archive retrieval job to download the data from an
archive. You will need to wait for the notification from
@@ -154,16 +154,11 @@ class Vault(object):
sends notification when the job is completed and the output
is ready for you to download.
- :type format: str
- :param format: Specify the output format. Valid values are:
- CSV|JSON. Default is JSON.
-
:rtype: :class:`boto.glacier.job.Job`
:return: A Job object representing the retrieval job.
"""
job_data = {'Type': 'archive-retrieval',
- 'ArchiveId': archive_name,
- 'Format': format}
+ 'ArchiveId': archive_name}
if sns_topic is not None:
job_data['SNSTopic'] = sns_topic
if description is not None: