duplicity-team team mailing list archive

[Gwyn Ciesla <gwync@xxxxxxxxxxxxxx>]

Gwyn Ciesla has proposed merging lp:~limburgher/duplicity/dropbox into lp:duplicity.

Commit message:
Correct types for os.join in Dropbox backend. Resolves https://bugs.launchpad.net/duplicity/+bug/1836611.

Requested reviews:
  duplicity-team (duplicity-team)

For more details, see:
https://code.launchpad.net/~limburgher/duplicity/dropbox/+merge/370225
-- 
Your team duplicity-team is requested to review the proposed merge of lp:~limburgher/duplicity/dropbox into lp:duplicity.

=== modified file 'duplicity/backends/dpbxbackend.py'
--- duplicity/backends/dpbxbackend.py	2019-06-17 15:10:58 +0000
+++ duplicity/backends/dpbxbackend.py	2019-07-16 21:36:18 +0000
@@ -209,7 +209,7 @@
     @command()
     def _put(self, source_path, remote_filename):
         remote_dir = urllib.parse.unquote(self.parsed_url.path.lstrip(u'/'))
-        remote_path = u'/' + os.path.join(remote_dir, remote_filename).rstrip()
+        remote_path = u'/' + os.path.join(remote_dir, remote_filename.decode()).rstrip()
 
         file_size = os.path.getsize(source_path.name)
         progress.report_transfer(0, file_size)
@@ -368,7 +368,7 @@
             self.login()
 
         remote_dir = urllib.parse.unquote(self.parsed_url.path.lstrip(u'/'))
-        remote_path = u'/' + os.path.join(remote_dir, remote_filename).rstrip()
+        remote_path = u'/' + os.path.join(remote_dir, remote_filename.decode()).rstrip()
 
         log.Debug(u'dpbx,files_download(%s)' % remote_path)
         res_metadata, http_fd = self.api_client.files_download(remote_path)
@@ -433,7 +433,7 @@
             self.login()
 
         remote_dir = urllib.parse.unquote(self.parsed_url.path.lstrip(u'/'))
-        remote_path = u'/' + os.path.join(remote_dir, filename).rstrip()
+        remote_path = u'/' + os.path.join(remote_dir, filename.decode()).rstrip()
 
         log.Debug(u'dpbx.files_delete(%s)' % remote_path)
         self.api_client.files_delete(remote_path)
@@ -452,7 +452,7 @@
         if not self.user_authenticated():
             self.login()
         remote_dir = urllib.parse.unquote(self.parsed_url.path.lstrip(u'/'))
-        remote_path = u'/' + os.path.join(remote_dir, filename).rstrip()
+        remote_path = u'/' + os.path.join(remote_dir, filename.decode()).rstrip()
 
         log.Debug(u'dpbx.files_get_metadata(%s)' % remote_path)
         info = self.api_client.files_get_metadata(remote_path)