duplicity 3.0.8.dev3__tar.gz → 3.0.8.dev6__tar.gz

{duplicity-3.0.8.dev3 → duplicity-3.0.8.dev6}/AUTHORS.md

@@ -32,7 +32,7 @@ Duplicity Authors
 - Stefan Breunig <stefan-duplicity@breunig.xyz>
 - Steve Tynor <steve.tynor@gmail.com>
 - Thomas Harning Jr <harningt@gmail.com>
-- Thomas Laubrock
+- Thomas Laubrock <duplicity-talk@schmu.net>
 - Tomas Vondra (Launchpad id: tomas-v)
 - Xavier Lucas <xavier.lucas@corp.ovh.com>
 - Yigal Asnis

{duplicity-3.0.8.dev3 → duplicity-3.0.8.dev6}/CHANGELOG.md

@@ -1,9 +1,45 @@
 
-(Unreleased) / 2025-12-31
+(Unreleased) / 2026-05-12
 =========================
 
 
 
+rel.3.0.8.dev5 / 2026-05-12
+===========================
+
+ * 3997156c:chg: Update README-RELEASE.md.
+ * 0f5430db:fix: Fix so GNUPGHOME is not changed in production.
+ * 53cc9659:fix: lower boto warning log level, rephrase.
+ * 88bfc75e:chg: Misc cleanups for developers
+ * 4b0bb8d5:chg: Update 'release pip version' in README-RELEASE.md.
+
+rel.3.0.8.dev4 / 2026-03-31
+===========================
+
+ * c17b03bc:fix: try/except block masking real S3UploadFailedError
+ * db127ce5:new: Add --full-if-n-inc flag for count-based full backup.
+ * dc977419:fix: Simplify swig module definition.
+ * 0de30e69:chg: Adjust to newer sphinx.
+ * c1883117:fix: Add templates for bug and feature requests.
+ * 39150d34:fix: delete unused Path.patch_with_attribs.
+ * 1a7c6790:fix: Remove support for Python 2.
+ * 564dd593:fix: fix flag name --gpg-agent -> --use-agent.
+ * 866680d0:chg: Multiple changes for 2026 are planned
+ * 29e00b55:fix: Fix incompatibility with Python 3.14.
+ * 50faabfc:chg: Partial fix for #924.
+ * 00ae7687:fix: webdav, always send warmup OPTIONS request, prevent loop
+ * 37841a0e:fix: Handle local version identifiers in b2backend
+
+rel.3.0.8.dev3 / 2026-01-14
+===========================
+
+ * 3475dd05:fix: Unnecessary passphrase prompt with --encrypt-key --no-check-remote.
+ * b8508f6d:chg: Remove slow marker from tests.
+
+rel.3.0.8.dev2 / 2026-01-14
+===========================
+
+
 rel.3.0.7 / 2025-12-31
 ======================
 

{duplicity-3.0.8.dev3/duplicity.egg-info → duplicity-3.0.8.dev6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: duplicity
-Version: 3.0.8.dev3
+Version: 3.0.8.dev6
 Summary: Encrypted backup using rsync algorithm
 Author-email: Kenneth Loafman <kenneth@loafman.com>
 Maintainer: Edgar Soldin, Thomas Laubrock
@@ -18,14 +18,13 @@ Classifier: Operating System :: MacOS
 Classifier: Operating System :: POSIX
 Classifier: Programming Language :: C
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: System :: Archiving :: Backup
-Requires-Python: <3.15,>3.8
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: COPYING
 License-File: AUTHORS.md
@@ -45,7 +44,7 @@ Requires-Dist: httplib2
 Requires-Dist: pysocks
 Requires-Dist: jottalib
 Requires-Dist: keyring
-Requires-Dist: lxml<=5.4.0
+Requires-Dist: lxml
 Requires-Dist: mediafire
 Requires-Dist: megatools
 Requires-Dist: paramiko

{duplicity-3.0.8.dev3 → duplicity-3.0.8.dev6}/duplicity/__init__.py

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2002 Ben Escoto
 # Copyright 2007 Kenneth Loafman
@@ -21,7 +21,7 @@
 
 import gettext
 
-__version__: str = "3.0.8.dev3"
-__reldate__: str = "January 14, 2026"
+__version__: str = "3.0.8.dev6"
+__reldate__: str = "May 12, 2026"
 
 gettext.install("duplicity", names=["ngettext"])

{duplicity-3.0.8.dev3 → duplicity-3.0.8.dev6}/duplicity/__main__.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # duplicity -- Encrypted bandwidth efficient backup
 #
@@ -62,8 +62,10 @@ def dup_run():
     # check that we can function here
     if os.environ.get("PYTEST_VERSION") is not None:
         pass
-    elif not ((3, 9) <= sys.version_info[:2] <= (3, 14)):
-        print("Sorry, duplicity requires version 3.9 thru 3.14 of Python.", file=sys.stderr)
+    elif os.environ.get("CIBUILDWHEEL") is not None:
+        pass
+    elif not ((3, 10) <= sys.version_info[:2] <= (3, 14)):
+        print("Sorry, duplicity requires Python version 3.10 thru 3.14.", file=sys.stderr)
         sys.exit(1)
 
     try:

{duplicity-3.0.8.dev3 → duplicity-3.0.8.dev6}/duplicity/_librsyncmodule.c

@@ -90,11 +90,7 @@ _librsync_sigmaker_cycle(_librsync_SigMakerObject *self, PyObject *args)
   rs_buffers_t buf;
   rs_result result;
 
-#if PY_MAJOR_VERSION >= 3
   if (!PyArg_ParseTuple(args, "y#:cycle", &inbuf, &inbuf_length))
-#else
-  if (!PyArg_ParseTuple(args, "s#:cycle", &inbuf, &inbuf_length))
-#endif
     return NULL;
 
   buf.next_in = inbuf;
@@ -110,11 +106,7 @@ _librsync_sigmaker_cycle(_librsync_SigMakerObject *self, PyObject *args)
     return NULL;
   }
 
-#if PY_MAJOR_VERSION >= 3
   return Py_BuildValue("(ily#)", (result == RS_DONE),
-#else
-  return Py_BuildValue("(ils#)", (result == RS_DONE),
-#endif
                        (long)inbuf_length - (long)buf.avail_in,
                        outbuf, RS_JOB_BLOCKSIZE - (long)buf.avail_out);
 }
@@ -178,11 +170,7 @@ _librsync_new_deltamaker(PyObject* self, PyObject* args)
   rs_buffers_t buf;
   rs_result result;
 
-#if PY_MAJOR_VERSION >= 3
   if (!PyArg_ParseTuple(args,"y#:new_deltamaker", &sig_string, &sig_length))
-#else
-  if (!PyArg_ParseTuple(args,"s#:new_deltamaker", &sig_string, &sig_length))
-#endif
     return NULL;
 
   dm = PyObject_New(_librsync_DeltaMakerObject, &_librsync_DeltaMakerType);
@@ -237,11 +225,7 @@ _librsync_deltamaker_cycle(_librsync_DeltaMakerObject *self, PyObject *args)
   rs_buffers_t buf;
   rs_result result;
 
-#if PY_MAJOR_VERSION >= 3
   if (!PyArg_ParseTuple(args, "y#:cycle", &inbuf, &inbuf_length))
-#else
-  if (!PyArg_ParseTuple(args, "s#:cycle", &inbuf, &inbuf_length))
-#endif
     return NULL;
 
   buf.next_in = inbuf;
@@ -256,11 +240,7 @@ _librsync_deltamaker_cycle(_librsync_DeltaMakerObject *self, PyObject *args)
     return NULL;
   }
 
-#if PY_MAJOR_VERSION >= 3
   return Py_BuildValue("(ily#)", (result == RS_DONE),
-#else
-  return Py_BuildValue("(ils#)", (result == RS_DONE),
-#endif
                        (long)inbuf_length - (long)buf.avail_in,
                        outbuf, RS_JOB_BLOCKSIZE - (long)buf.avail_out);
 }
@@ -374,11 +354,7 @@ _librsync_patchmaker_cycle(_librsync_PatchMakerObject *self, PyObject *args)
   rs_buffers_t buf;
   rs_result result;
 
-#if PY_MAJOR_VERSION >= 3
   if (!PyArg_ParseTuple(args, "y#:cycle", &inbuf, &inbuf_length))
-#else
-  if (!PyArg_ParseTuple(args, "s#:cycle", &inbuf, &inbuf_length))
-#endif
     return NULL;
 
   buf.next_in = inbuf;
@@ -393,11 +369,7 @@ _librsync_patchmaker_cycle(_librsync_PatchMakerObject *self, PyObject *args)
     return NULL;
   }
 
-#if PY_MAJOR_VERSION >= 3
   return Py_BuildValue("(ily#)", (result == RS_DONE),
-#else
-  return Py_BuildValue("(ils#)", (result == RS_DONE),
-#endif
                        (long)inbuf_length - (long)buf.avail_in,
                        outbuf, RS_JOB_BLOCKSIZE - (long)buf.avail_out);
 }
@@ -441,16 +413,6 @@ static PyTypeObject _librsync_PatchMakerType = {
 
 /* --------------- _librsync module definition */
 
-#if PY_MAJOR_VERSION >= 3
-#define MOD_DEF(ob, name, doc, methods) \
-  static struct PyModuleDef moduledef = { \
-    PyModuleDef_HEAD_INIT, name, doc, -1, methods, }; \
-  ob = PyModule_Create(&moduledef);
-#else
-#define MOD_DEF(ob, name, doc, methods) \
-  ob = Py_InitModule3(name, methods, doc);
-#endif
-
 static PyMethodDef _librsyncMethods[] = {
   {"new_sigmaker", _librsync_new_sigmaker, METH_VARARGS,
    "Return a sigmaker object, for finding the signature of an object"},
@@ -461,6 +423,9 @@ static PyMethodDef _librsyncMethods[] = {
   {NULL, NULL, 0, NULL}
 };
 
+static struct PyModuleDef moduledef = {
+  PyModuleDef_HEAD_INIT, "_librsync", "", -1, _librsyncMethods, };
+
 static PyObject *
 moduleinit(void)
 {
@@ -474,7 +439,7 @@ moduleinit(void)
   Py_TYPE(&_librsync_DeltaMakerType) = &PyType_Type;
   #endif
 
-  MOD_DEF(m, "_librsync", "", _librsyncMethods)
+  m = PyModule_Create(&moduledef);
   if (m == NULL)
       return NULL;
 
@@ -491,14 +456,7 @@ moduleinit(void)
   return m;
 }
 
-#if PY_MAJOR_VERSION < 3
-void init_librsync(void)
-{
-  moduleinit();
-}
-#else
 PyObject *PyInit__librsync(void)
 {
   return moduleinit();
 }
-#endif

{duplicity-3.0.8.dev3 → duplicity-3.0.8.dev6}/duplicity/backend.py

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2002 Ben Escoto
 # Copyright 2007 Kenneth Loafman

{duplicity-3.0.8.dev3 → duplicity-3.0.8.dev6}/duplicity/backend_pool.py

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2002 Ben Escoto
 # Copyright 2007 Kenneth Loafman

{duplicity-3.0.8.dev3 → duplicity-3.0.8.dev6}/duplicity/backends/__init__.py

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2002 Ben Escoto
 # Copyright 2007 Kenneth Loafman

{duplicity-3.0.8.dev3 → duplicity-3.0.8.dev6}/duplicity/backends/_cf_cloudfiles.py

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2009 Eric EJ Johnson
 #
@@ -39,10 +39,8 @@ class CloudFilesBackend(duplicity.backend.Backend):
             from cloudfiles import consts
             from cloudfiles.errors import NoSuchObject
         except ImportError as e:
-            raise BackendException(
-                f"""Cloudfiles backend requires the cloudfiles library available from Rackspace.
-Exception: {str(e)}"""
-            )
+            raise BackendException(f"""Cloudfiles backend requires the cloudfiles library available from Rackspace.
+Exception: {str(e)}""")
 
         self.resp_exc = ResponseError
         conn_kwargs = {}

{duplicity-3.0.8.dev3 → duplicity-3.0.8.dev6}/duplicity/backends/_cf_pyrax.py

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2013 J.P. Krauss
 #
@@ -37,10 +37,8 @@ class PyraxBackend(duplicity.backend.Backend):
         try:
             import pyrax
         except ImportError as e:
-            raise BackendException(
-                f"""Pyrax backend requires the pyrax library available from Rackspace.
-Exception: {str(e)}"""
-            )
+            raise BackendException(f"""Pyrax backend requires the pyrax library available from Rackspace.
+Exception: {str(e)}""")
 
         # Inform Pyrax that we're talking to Rackspace
         # per Jesus Monzon (gsusmonzon)

{duplicity-3.0.8.dev3 → duplicity-3.0.8.dev6}/duplicity/backends/_testbackend.py

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2002 Ben Escoto
 # Copyright 2007 Kenneth Loafman
@@ -25,19 +25,16 @@ import inspect
 import json
 import logging
 import os
-from random import random
 import re
 import sys
 import time
+from random import random
 
 import duplicity.backend
-from duplicity import (
-    log,
-    path,
-    progress,
-)
+from duplicity import log
+from duplicity import path
+from duplicity import progress
 from duplicity.errors import BackendException
-from testing import _runtest_dir
 
 
 class BackendErrors:
@@ -66,6 +63,8 @@ class _TestBackend(duplicity.backend.Backend):
 
     def __init__(self, parsed_url):
         super().__init__(parsed_url)
+        from testing import _runtest_dir
+
         log._logger.addHandler(logging.FileHandler(f"{_runtest_dir}/testbackend.log"))
         log.Warn("TestBackend is not made for production use!")
         # The URL form "file:MyFile" is not a valid duplicity target.

{duplicity-3.0.8.dev3 → duplicity-3.0.8.dev6}/duplicity/backends/adbackend.py

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2016 Stefan Breunig
 # Based on the backend onedrivebackend.py

{duplicity-3.0.8.dev3 → duplicity-3.0.8.dev6}/duplicity/backends/azurebackend.py

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2013 Matthieu Huin
 # Copyright 2015 Scott McKenzie

{duplicity-3.0.8.dev3 → duplicity-3.0.8.dev6}/duplicity/backends/b2backend.py

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright (c) 2015 Matthew Bentley
 #
@@ -73,7 +73,8 @@ class B2Backend(duplicity.backend.Backend):
         try:  # figure out what version of b2sdk we have
             from b2sdk import __version__ as VERSION  # pylint: disable=import-error
 
-            v_split = VERSION.split(".")
+            v_public = VERSION.partition("+")[0]  # ignore local version identifier if present
+            v_split = v_public.split(".")
             self.v_num = [int(x) for x in v_split]
         except Exception as e:
             self.v_num = [0, 0, 0]

{duplicity-3.0.8.dev3 → duplicity-3.0.8.dev6}/duplicity/backends/boxbackend.py

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2020 Jose L. Domingo Lopez
 #

{duplicity-3.0.8.dev3 → duplicity-3.0.8.dev6}/duplicity/backends/cfbackend.py

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2013 Kenneth Loafman
 #

{duplicity-3.0.8.dev3 → duplicity-3.0.8.dev6}/duplicity/backends/dpbxbackend.py

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2013 jno
 # Copyright 2016 Dmitry Nezhevenko
@@ -120,11 +120,9 @@ class DPBXBackend(duplicity.backend.Backend):
             )
             from dropbox.oauth import DropboxOAuth2FlowNoRedirect
         except ImportError as e:
-            raise BackendException(
-                f"""This backend requires the dropbox package version 6.9.0
+            raise BackendException(f"""This backend requires the dropbox package version 6.9.0
 To install use "sudo pip install dropbox==6.9.0"
-Exception: {str(e)}"""
-            )
+Exception: {str(e)}""")
 
         self.api_account = None
         self.api_client = None

{duplicity-3.0.8.dev3 → duplicity-3.0.8.dev6}/duplicity/backends/gdocsbackend.py

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2011 Carlos Abalde
 #

{duplicity-3.0.8.dev3 → duplicity-3.0.8.dev6}/duplicity/backends/gdrivebackend.py

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2015 Yigal Asnis
 # Copyright 2021 Jindrich Makovicka
@@ -38,11 +38,9 @@ class GDriveBackend(duplicity.backend.Backend):
             from googleapiclient.discovery import build
             from google.oauth2.service_account import Credentials
         except ImportError as e:
-            raise BackendException(
-                f"""GDrive backend requires Google API client installation.
+            raise BackendException(f"""GDrive backend requires Google API client installation.
 Please read the manpage for setup details.
-Exception: {str(e)}"""
-            )
+Exception: {str(e)}""")
 
         # Note Google has 2 drive methods, `Shared(previously Team) Drives` and `My Drive`
         #   both can be shared but require different addressing

{duplicity-3.0.8.dev3 → duplicity-3.0.8.dev6}/duplicity/backends/giobackend.py

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2009 Michael Terry
 #

{duplicity-3.0.8.dev3 → duplicity-3.0.8.dev6}/duplicity/backends/hsibackend.py

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2002 Ben Escoto
 # Copyright 2007 Kenneth Loafman

{duplicity-3.0.8.dev3 → duplicity-3.0.8.dev6}/duplicity/backends/hubicbackend.py

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2013 J.P. Krauss
 #
@@ -38,10 +38,8 @@ class HubicBackend(PyraxBackend):
         try:
             import pyrax
         except ImportError as e:
-            raise BackendException(
-                f"""Hubic backend requires the pyrax library available from Rackspace.
-Exception: {str(e)}"""
-            )
+            raise BackendException(f"""Hubic backend requires the pyrax library available from Rackspace.
+Exception: {str(e)}""")
 
         # Inform Pyrax that we're talking to Hubic
         pyrax.set_setting("identity_type", "duplicity.backends.pyrax_identity.hubic.HubicIdentity")

{duplicity-3.0.8.dev3 → duplicity-3.0.8.dev6}/duplicity/backends/idrivedbackend.py

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2021 Menno Smits
 #
@@ -31,7 +31,6 @@ from duplicity import config
 from duplicity import log
 from duplicity.errors import BackendException
 
-
 #
 #   This backend works with the IDrive  "dedup implementation". V0.1
 #               (for all new and recent accounts)

{duplicity-3.0.8.dev3 → duplicity-3.0.8.dev6}/duplicity/backends/imapbackend.py

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2002 Ben Escoto
 # Copyright 2007 Kenneth Loafman
@@ -168,7 +168,7 @@ class ImapBackend(duplicity.backend.Backend):
         while allowedTimeout > 0:
             try:
                 self.conn.select(config.imap_mailbox)
-                (result, flist) = self.conn.search(None, "Subject", remote_filename)
+                result, flist = self.conn.search(None, "Subject", remote_filename)
                 if result != "OK":
                     raise Exception(flist[0])
 
@@ -176,7 +176,7 @@ class ImapBackend(duplicity.backend.Backend):
                 if flist[0] == "":
                     raise Exception("no mail with subject %s")
 
-                (result, flist) = self.conn.fetch(flist[0], "(RFC822)")
+                result, flist = self.conn.fetch(flist[0], "(RFC822)")
 
                 if result != "OK":
                     raise Exception(flist[0])
@@ -211,7 +211,7 @@ class ImapBackend(duplicity.backend.Backend):
 
     def _list(self):
         ret = []
-        (result, flist) = self.conn.select(config.imap_mailbox)
+        result, flist = self.conn.select(config.imap_mailbox)
         if result != "OK":
             raise BackendException(flist[0])
 
@@ -219,14 +219,14 @@ class ImapBackend(duplicity.backend.Backend):
         # address
 
         # Search returns an error if you haven't selected an IMAP folder.
-        (result, flist) = self.conn.search(None, "FROM", self.remote_dir)
+        result, flist = self.conn.search(None, "FROM", self.remote_dir)
         if result != "OK":
             raise Exception(flist[0])
         if flist[0] == b"":
             return ret
         nums = flist[0].strip().split(b" ")
         set = b"%s:%s" % (nums[0], nums[-1])  # pylint: disable=redefined-builtin
-        (result, flist) = self.conn.fetch(set, "(BODY[HEADER])")
+        result, flist = self.conn.fetch(set, "(BODY[HEADER])")
         if result != "OK":
             raise Exception(flist[0])
 
@@ -247,7 +247,7 @@ class ImapBackend(duplicity.backend.Backend):
         return ret
 
     def imapf(self, fun, *args):
-        (ret, flist) = fun(*args)
+        ret, flist = fun(*args)
         if ret != "OK":
             raise Exception(flist[0])
         return flist

{duplicity-3.0.8.dev3 → duplicity-3.0.8.dev6}/duplicity/backends/jottacloudbackend.py

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2014 Havard Gulldahl
 # Copyright 2013 jno

{duplicity-3.0.8.dev3 → duplicity-3.0.8.dev6}/duplicity/backends/lftpbackend.py

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2002 Ben Escoto
 # Copyright 2007 Kenneth Loafman

{duplicity-3.0.8.dev3 → duplicity-3.0.8.dev6}/duplicity/backends/localbackend.py

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2002 Ben Escoto
 # Copyright 2007 Kenneth Loafman

{duplicity-3.0.8.dev3 → duplicity-3.0.8.dev6}/duplicity/backends/mediafirebackend.py

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2016 Roman Yepishev
 #
@@ -38,10 +38,8 @@ class MediafireBackend(duplicity.backend.Backend):
         try:
             import mediafire.client
         except ImportError as e:
-            raise BackendException(
-                f"""Mediafire backend requires the mediafire library.
-Exception: {str(e)}"""
-            )
+            raise BackendException(f"""Mediafire backend requires the mediafire library.
+Exception: {str(e)}""")
 
         duplicity.backend.Backend.__init__(self, parsed_url)
 

{duplicity-3.0.8.dev3 → duplicity-3.0.8.dev6}/duplicity/backends/megabackend.py

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2017 Tomas Vondra
 # Copyright 2017 Kenneth Loafman

{duplicity-3.0.8.dev3 → duplicity-3.0.8.dev6}/duplicity/backends/megav2backend.py

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2020 Jose L. Domingo Lopez
 #

{duplicity-3.0.8.dev3 → duplicity-3.0.8.dev6}/duplicity/backends/megav3backend.py

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2020 Jose L. Domingo Lopez
 #

{duplicity-3.0.8.dev3 → duplicity-3.0.8.dev6}/duplicity/backends/multibackend.py

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2015 Steve Tynor
 # Copyright 2016 Thomas Harning Jr

{duplicity-3.0.8.dev3 → duplicity-3.0.8.dev6}/duplicity/backends/ncftpbackend.py

@@ -1,4 +1,4 @@
-# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; encoding:utf-8 -*-
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4; coding:utf-8 -*-
 #
 # Copyright 2002 Ben Escoto
 # Copyright 2007 Kenneth Loafman