Merge lp:~matthew-t-bentley/duplicity/b2 into lp:~duplicity-team/duplicity/0.7-series

[Matthew Bentley]

Fix import and error typos.

[lp:~matthew-t-bentley/duplicity/b2]

1162. By Matthew Bentley on 2015-12-08

Merge and re-add missing error

[edso (ed.so)]

On 08.12.2015 17:04, Matthew Bentley wrote:
> - 'maxFileCount': 1000,
> + 'bucketId': self.bucket_id,
> + 'maxFileCount': 1000,

this looks faulty. we had to revert max file arguments for listings from other cloud backends before, because the listing became incomplete when users had lot's of backups and duplicity couldn't find all files for a chain anymore.

..ede/duply.net

[lp:~matthew-t-bentley/duplicity/b2]

1163. By Matthew Bentley on 2015-12-08

Allow multiple backups in the same bucket

1164. By Matthew Bentley on 2015-12-09

Add debugging for b2backend

1165. By Matthew Bentley on 2015-12-09

Set fake (otherwise unused) hostname for prettier password prompt
Thanks to Andreas Knab <email address hidden> for the patch

1166. By Matthew Bentley on 2015-12-09

Make sure listed files are exactly in the requested path
Thanks to Andreas Knab <email address hidden> for the pull request

Unmerged revisions

=== modified file 'duplicity/backends/b2backend.py'
--- duplicity/backends/b2backend.py	2015-12-04 11:34:25 +0000
+++ duplicity/backends/b2backend.py	2015-12-08 16:07:46 +0000
@@ -27,6 +27,7 @@
 
 import duplicity.backend
 from duplicity.errors import BackendException, FatalBackendException
+from duplicity import log
 
 import json
 import urllib2
@@ -122,8 +123,8 @@
         endpoint = 'b2_list_file_names'
         url = self.formatted_url(endpoint)
         params = {
-            'bucketId': self.bucket_id,
-            'maxFileCount': 1000,
+                'bucketId': self.bucket_id,
+                'maxFileCount': 1000,
         }
         try:
             resp = self.get_or_post(url, params)
@@ -179,9 +180,9 @@
             if e.code == 400:
                 return log.ErrorCode.bad_request
             if e.code == 500:
-                return log.ErrorCode.backed_error
+                return log.ErrorCode.backend_error
             if e.code == 403:
-                return log.ErrorCode.backed_permission_denied
+                return log.ErrorCode.backend_permission_denied
 
     def find_or_create_bucket(self, bucket_name):
         """
@@ -215,7 +216,7 @@
             'accountId': self.account_id,
             'bucketName': bucket_name,
             'bucketType': 'allPrivate'
-        }
+            }
         resp = self.get_or_post(url, params)
 
         self.bucket_id = resp['bucketId']