Fix tox

mar10 · Mar 6, 2023 · d1f1454 · d1f1454
1 parent 173067e
commit d1f1454
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 6 deletions.
diff --git a/ftpsync/resources.py b/ftpsync/resources.py
@@ -338,7 +338,6 @@ def classify(self, peer_dir_meta):
 # FileEntry
 # ===============================================================================
 class FileEntry(_Resource):
-
     # 2 seconds difference is considered equal.
     # mtime stamp resolution depends on filesystem: FAT32. 2 seconds, NTFS ms, OSX. 1 sec.
     EPS_TIME = 2.01

diff --git a/ftpsync/sftp_target.py b/ftpsync/sftp_target.py
@@ -382,7 +382,10 @@ def rmdir(self, dir_name):
         # return self.sftp.rmdir(dir_name)
         return self._rmdir_impl(dir_name)
 
-    _paramiko_py3compat_u = paramiko.py3compat.u
+    try:
+        _paramiko_py3compat_u = paramiko.util.u
+    except AttributeError:
+        _paramiko_py3compat_u = paramiko.py3compat.u
 
     @staticmethod
     def _paramiko_py3compat_u_wrapper(s, encoding="utf8"):

diff --git a/ftpsync/synchronizers.py b/ftpsync/synchronizers.py
@@ -599,7 +599,6 @@ def _sync_dir(self):
 
         # 4. Perform (or schedule) resulting file operations
         for pair in entry_pair_list:
-
             # print(pair)
 
             # Let synchronizer modify the default operation (e.g. apply `--force` option)

diff --git a/ftpsync/targets.py b/ftpsync/targets.py
@@ -418,7 +418,6 @@ def remove_sync_info(self, name):
 
 
 class FsTarget(_Target):
-
     DEFAULT_BLOCKSIZE = 16 * 1024  # shutil.copyobj() uses 16k blocks by default
 
     def __init__(self, root_dir, extra_opts=None):

diff --git a/tests/test_develop.py b/tests/test_develop.py
@@ -37,7 +37,6 @@ def tearDown(self):
         super().tearDown()
 
     def test_issue_20(self):
-
         opts = {"verbose": 5}
 
         local_target = make_target(self.local_url)

diff --git a/tests/test_sync_bidir.py b/tests/test_sync_bidir.py
@@ -156,7 +156,6 @@ def test_resolve_local(self):
         self.assert_test_folder_equal(get_test_folder("remote"), expect_local)
 
     def test_resolve_remote(self):
-
         opts = {"resolve": "remote", "verbose": self.verbose}
 
         stats = self.do_run_suite(BiDirSynchronizer, opts)