Merge lp:~mterry/duplicity/boto-import into lp:~duplicity-team/duplicity/0.8-series

Proposed by Michael Terry
Status: Merged
Merged at revision: 1383
Proposed branch: lp:~mterry/duplicity/boto-import
Merge into: lp:~duplicity-team/duplicity/0.8-series
Diff against target: 25 lines (+4/-0)
2 files modified
duplicity/backends/_boto_multi.py (+2/-0)
duplicity/backends/_boto_single.py (+2/-0)
To merge this branch: bzr merge lp:~mterry/duplicity/boto-import
Reviewer Review Type Date Requested Status
duplicity-team Pending
Review via email: mp+369269@code.launchpad.net

Description of the change

A couple functions in the boto backend were using the boto module without importing it first.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'duplicity/backends/_boto_multi.py'
2--- duplicity/backends/_boto_multi.py 2019-06-17 15:10:58 +0000
3+++ duplicity/backends/_boto_multi.py 2019-06-24 22:27:26 +0000
4@@ -113,6 +113,8 @@
5 self._pool.join()
6
7 def upload(self, filename, key, headers=None):
8+ import boto
9+
10 chunk_size = globals.s3_multipart_chunk_size
11
12 # Check minimum chunk size for S3
13
14=== modified file 'duplicity/backends/_boto_single.py'
15--- duplicity/backends/_boto_single.py 2019-06-17 15:10:58 +0000
16+++ duplicity/backends/_boto_single.py 2019-06-24 22:27:26 +0000
17@@ -182,6 +182,8 @@
18 del self.storage_uri
19
20 def resetConnection(self):
21+ import boto
22+
23 if getattr(self, u'conn', False):
24 self.conn.close()
25 self.bucket = None

Subscribers

People subscribed via source and target branches