diff options
| author | Mitch Garnaat <mitch@garnaat.com> | 2012-09-19 19:44:48 -0700 |
|---|---|---|
| committer | Mitch Garnaat <mitch@garnaat.com> | 2012-09-19 19:44:48 -0700 |
| commit | fbb516914d286a691432cbca87c1cf564fdc57e4 (patch) | |
| tree | 95923368e2544e76199b40ee5d877397a5ecee09 | |
| parent | 85fc603ade9b31b5d78ce549b0398daf3ae9fb3c (diff) | |
| parent | 95610c1d8fd189024964faf7d519be4996ba0b2e (diff) | |
| download | boto-glacier.tar.gz | |
Merge pull request #1001 from basak/add_description_parameterglacier
Add description to Vault.create_archive_from_file
| -rw-r--r-- | boto/glacier/vault.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/boto/glacier/vault.py b/boto/glacier/vault.py index 4d0e0723..dc691f3c 100644 --- a/boto/glacier/vault.py +++ b/boto/glacier/vault.py @@ -115,7 +115,8 @@ class Vault(object): description) return Writer(self, response['UploadId'], part_size=part_size) - def create_archive_from_file(self, filename=None, file_obj=None): + def create_archive_from_file(self, filename=None, file_obj=None, + description=None): """ Create a new archive and upload the data from the given file or file-like object. @@ -132,7 +133,7 @@ class Vault(object): if not file_obj: file_obj = open(filename, "rb") - writer = self.create_archive_writer() + writer = self.create_archive_writer(description=description) while True: data = file_obj.read(self.DefaultPartSize) if not data: |